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

common: Fix other user's languages never getting added

Browse source 
Because we were looking for a locale directory with the extra
codeset (xx_XX.utf8) instead of without it.
This commit is contained in:
Bastien Nocera 2012-12-10 15:06:14 +01:00
parent fb1f2baea5
commit becfb7a7c8
1 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -449,6 +449,28 @@ cc_common_language_select_current_language (GtkTreeView *treeview)
g_warning ("Could not find current language '%s' in the treeview", lang); g_warning ("Could not find current language '%s' in the treeview", lang);
} }
static gboolean
user_language_has_translations (const char *locale)
{
char *name, *language_code, *territory_code;
gboolean ret;
gdm_parse_language_name (locale,
&language_code,
&territory_code,
NULL, NULL);
name = g_strdup_printf ("%s%s%s",
language_code,
territory_code != NULL? "_" : "",
territory_code != NULL? territory_code : "");
g_free (language_code);
g_free (territory_code);
ret = gdm_language_has_translations (name);
g_free (name);
return ret;
}
static char * static char *
get_lang_for_user_object_path (const char *path) get_lang_for_user_object_path (const char *path)
{ {
@ -522,7 +544,7 @@ add_other_users_language (GHashTable *ht)
lang = get_lang_for_user_object_path (str); lang = get_lang_for_user_object_path (str);
if (lang != NULL && *lang != '\0' && if (lang != NULL && *lang != '\0' &&
cc_common_language_has_font (lang) && cc_common_language_has_font (lang) &&
gdm_language_has_translations (lang)) { user_language_has_translations (lang)) {
name = gdm_normalize_language_name (lang); name = gdm_normalize_language_name (lang);
if (!g_hash_table_lookup (ht, name)) { if (!g_hash_table_lookup (ht, name)) {
language = gdm_get_language_from_name (name, NULL); language = gdm_get_language_from_name (name, NULL);