shaba/virt-viewer
1
0
Fork 0
mirror of https://gitlab.com/virt-viewer/virt-viewer.git synced 2025-03-11 16:58:16 +03:00
Code Issues Projects Releases Wiki Activity

Create single strings for the window title

Browse Source 
Currently there is a strings with four placeholders that represents
optional bits: the "press to release", a whitespace (!), the subtitle,
and the application title. This is suboptimal, because it hides the way
the title is composed, and makes it hard to properly translate.

Instead of this string puzzle, create separate strings for each case
(there are only four of them, and one is only the application title).
Each of the string has all the static text availale, with a proper
comment explaining the layout.

Signed-off-by: Pino Toscano <ptoscano@redhat.com>
This commit is contained in:
Pino Toscano 2020-07-22 14:35:03 +02:00
parent 6621cc2f33
commit 0325901984
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/virt-viewer-window.c
View File

@ -1390,7 +1390,6 @@ virt_viewer_window_update_title(VirtViewerWindow *self)
{
VirtViewerWindowPrivate *priv = self->priv;
char *title;
gchar *ungrab = NULL;
if (priv->grabbed) {
gchar *label;
@ -1406,29 +1405,41 @@ virt_viewer_window_update_title(VirtViewerWindow *self)
label = g_strdup(_("Ctrl_L+Alt_L"));
}
ungrab = g_strdup_printf(_("(Press %s to release pointer)"), label);
g_free(label);
}
if (priv->subtitle) {
/* translators:
* This is "<ungrab accelerator> <subtitle> - <appname>"
* Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
*/
title = g_strdup_printf(_("(Press %s to release pointer) %s - %s"),
label,
priv->subtitle,
g_get_application_name());
} else {
/* translators:
* This is "<ungrab accelerator> - <appname>"
* Such as: "(Press Ctrl+Alt to release pointer) - Virt Viewer"
*/
title = g_strdup_printf(_("(Press %s to release pointer) - %s"),
label,
g_get_application_name());
}
if (!ungrab && !priv->subtitle)
title = g_strdup(g_get_application_name());
else
g_free(label);
} else if (priv->subtitle) {
/* translators:
* This is "<ungrab (or empty)><space (or empty)><subtitle (or empty)> - <appname>"
* Such as: "(Press Ctrl+Alt to release pointer) BigCorpTycoon MOTD - Virt Viewer"
* This is "<subtitle> - <appname>"
* Such as: "BigCorpTycoon MOTD - Virt Viewer"
*/
title = g_strdup_printf(_("%s%s%s - %s"),
/* translators: <ungrab empty> */
ungrab ? ungrab : "",
/* translators: <space> */
ungrab && priv->subtitle ? _(" ") : "",
title = g_strdup_printf(_("%s - %s"),
priv->subtitle,
g_get_application_name());
} else {
title = g_strdup(g_get_application_name());
}
gtk_window_set_title(GTK_WINDOW(priv->window), title);
g_free(title);
g_free(ungrab);
}
void