applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

common: Cleanup initial languages code

Browse source 
There's no need to use our own translations and setlocale() directly
since gnome-languages already does that for us.
This commit is contained in:
Rui Matos 2013-02-04 17:04:17 +01:00
parent a0ba3bc4fc
commit f457cc8cc4
1 changed files with 44 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
panels/common/cc-common-language.c
View file

@ -574,55 +574,48 @@ add_other_users_language (GHashTable *ht)
g_object_unref (proxy); g_object_unref (proxy);
} }
#define TRANSLATED_LANG(x) g_strdup(dgettext("iso_639", x))
static void static void
insert_language (GHashTable *ht, insert_language (GHashTable *ht,
const char *short_lang, const char *lang)
const char *long_lang,
gboolean in_iso_639,
const char *lang_label)
{ {
const char *lang; gboolean has_translations;
char *old_lang; char *label_own_lang;
char *label; char *label_current_lang;
char *label_untranslated;
char *key; char *key;
if (gnome_language_has_translations (long_lang)) has_translations = gnome_language_has_translations (lang);
lang = long_lang; if (!has_translations) {
else if (short_lang != NULL && gnome_language_has_translations (short_lang)) char *lang_code = g_strndup (lang, 2);
lang = short_lang; has_translations = gnome_language_has_translations (lang_code);
else { g_free (lang_code);
g_warning ("%s lacks translations, why is it default?", long_lang);
if (!has_translations)
return; return;
} }
g_debug ("We have translations for %s", lang); g_debug ("We have translations for %s", lang);
key = g_strdup_printf ("%s.utf8", long_lang); key = g_strdup_printf ("%s.utf8", lang);
old_lang = g_strdup (setlocale (LC_MESSAGES, NULL)); label_own_lang = gnome_get_language_from_locale (key, key);
setlocale (LC_MESSAGES, key); label_current_lang = gnome_get_language_from_locale (key, NULL);
g_debug ("Set new lang '%s' (old lang: %s)", key, old_lang); label_untranslated = gnome_get_language_from_locale (key, "C");
if (in_iso_639)
label = dgettext ("iso_639", lang_label); /* We don't have a translation for the label in
else
label = gettext (lang_label);
/* We don't have a translation for lang_label in
* its own language? */ * its own language? */
if (g_strcmp0 (label, lang_label) == 0 && if (g_strcmp0 (label_own_lang, label_untranslated) == 0) {
g_str_has_prefix (long_lang, "en_") == FALSE) { if (g_strcmp0 (label_current_lang, label_untranslated) == 0)
g_warning ("No translation for %s in %s, trying in current language", lang_label, key); g_hash_table_insert (ht, key, g_strdup (label_untranslated));
setlocale (LC_MESSAGES, old_lang); else
g_debug ("Resetting to old lang '%s'", old_lang); g_hash_table_insert (ht, key, g_strdup (label_current_lang));
label = _(lang_label);
g_hash_table_insert (ht, key, g_strdup (label));
} else { } else {
g_hash_table_insert (ht, key, g_strdup (label)); g_hash_table_insert (ht, key, g_strdup (label_own_lang));
setlocale (LC_MESSAGES, old_lang);
g_debug ("Resetting to old lang '%s'", old_lang);
} }
g_free (old_lang);
g_free (label_own_lang);
g_free (label_current_lang);
g_free (label_untranslated);
} }
GHashTable * GHashTable *
@ -632,18 +625,15 @@ cc_common_language_get_initial_languages (void)
ht = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); ht = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
/* Add some common languages first, insert_language (ht, "en_US");
* only the languages not listed in ISO-639 are insert_language (ht, "en_GB");
* marked for translation */ insert_language (ht, "de_DE");
insert_language (ht, "en", "en_US", TRUE, "English"); insert_language (ht, "fr_FR");
insert_language (ht, NULL, "en_GB", FALSE, N_("British English")); insert_language (ht, "es_ES");
insert_language (ht, "de", "de_DE", TRUE, "German"); insert_language (ht, "zh_CN");
insert_language (ht, "fr", "fr_FR", TRUE, "French"); insert_language (ht, "ja_JP");
insert_language (ht, "es", "es_ES", FALSE, N_("Spanish")); insert_language (ht, "ru_RU");
insert_language (ht, NULL, "zh_CN", FALSE, N_("Chinese (simplified)")); insert_language (ht, "ar_EG");
insert_language (ht, "ja", "ja_JP", TRUE, "Japanese");
insert_language (ht, "ru", "ru_RU", FALSE, "Russian");
insert_language (ht, "ar", "ar_EG", TRUE, "Arabic");
return ht; return ht;
} }