1 # Description: If a .desktop file does not have inline translations, fall back to calling gettext.
2 # Ubuntu: https://launchpad.net/bugs/3935
3 # Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=569829
4 Index: glib2.0-2.19.5/glib/gkeyfile.c
5 ===================================================================
6 --- glib2.0-2.19.5.orig/glib/gkeyfile.c 2009-01-30 15:34:03.000000000 +0100
7 +++ glib2.0-2.19.5/glib/gkeyfile.c 2009-01-30 15:34:32.000000000 +0100
12 + gchar *gettext_domain;
15 typedef struct _GKeyFileKeyValuePair GKeyFileKeyValuePair;
17 key_file->list_separator = ';';
19 key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
20 + key_file->gettext_domain = NULL;
25 key_file->parse_buffer = NULL;
28 + if (key_file->gettext_domain)
30 + g_free (key_file->gettext_domain);
31 + key_file->gettext_domain = NULL;
34 tmp = key_file->groups;
41 + key_file->gettext_domain = g_key_file_get_string (key_file,
42 + G_KEY_FILE_DESKTOP_GROUP,
43 + G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
53 + key_file->gettext_domain = g_key_file_get_string (key_file,
54 + G_KEY_FILE_DESKTOP_GROUP,
55 + G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
62 GError *key_file_error;
64 gboolean free_languages = FALSE;
65 + gboolean try_gettext = FALSE;
66 + const gchar *msg_locale;
69 g_return_val_if_fail (key_file != NULL, NULL);
70 @@ -1692,6 +1712,23 @@
71 free_languages = FALSE;
74 + /* we're only interested in gettext translation if we don't have a
75 + * translation in the .desktop file itself and if the key is one of the keys
76 + * we know we want to translate: Name, GenericName, Comment. Blindly doing
77 + * this for all keys can give strange result for the icons, since the Icon is
78 + * a locale string in the spec, eg. We also only get translation in the mo
79 + * file if the requested locale is the LC_MESSAGES one. Ideally, we should do
80 + * more and change LC_MESSAGES to use the requested locale, but there's no
81 + * guarantee it's installed on the system and it might have some
82 + * side-effects. Since this is a corner case, let's ignore it. */
84 + msg_locale = setlocale (LC_MESSAGES, NULL);
85 + try_gettext = msg_locale && key_file->gettext_domain &&
86 + strcmp (group_name, G_KEY_FILE_DESKTOP_GROUP) == 0 &&
87 + (strcmp (key, G_KEY_FILE_DESKTOP_KEY_NAME) == 0 ||
88 + strcmp (key, G_KEY_FILE_DESKTOP_KEY_GENERIC_NAME) == 0 ||
89 + strcmp (key, G_KEY_FILE_DESKTOP_KEY_COMMENT) == 0);
91 for (i = 0; languages[i]; i++)
93 candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]);
94 @@ -1708,6 +1745,39 @@
95 translated_value = NULL;
98 + /* Fallback to gettext */
99 + if (try_gettext && !translated_value)
101 + gchar *orig_value = g_key_file_get_string (key_file, group_name, key, NULL);
105 + gboolean codeset_set;
106 + const gchar *translated;
107 + gboolean has_gettext;
109 + codeset_set = bind_textdomain_codeset (key_file->gettext_domain, "UTF-8") != NULL;
112 + translated = g_dgettext (key_file->gettext_domain,
114 + has_gettext = translated != orig_value;
116 + g_free (orig_value);
121 + translated_value = g_strdup (translated);
123 + translated_value = g_locale_to_utf8 (translated,
124 + -1, NULL, NULL, NULL);
127 + translated_value = NULL;
131 /* Fallback to untranslated key
133 if (!translated_value)
134 Index: glib2.0-2.19.5/glib/gkeyfile.h
135 ===================================================================
136 --- glib2.0-2.19.5.orig/glib/gkeyfile.h 2009-01-30 15:34:03.000000000 +0100
137 +++ glib2.0-2.19.5/glib/gkeyfile.h 2009-01-30 15:34:32.000000000 +0100
139 #define G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY "StartupNotify"
140 #define G_KEY_FILE_DESKTOP_KEY_STARTUP_WM_CLASS "StartupWMClass"
141 #define G_KEY_FILE_DESKTOP_KEY_URL "URL"
142 +#define G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN "X-GNOME-Gettext-Domain"
144 #define G_KEY_FILE_DESKTOP_TYPE_APPLICATION "Application"
145 #define G_KEY_FILE_DESKTOP_TYPE_LINK "Link"