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

common: Try to get the configured language as the current one

Browse source
This commit is contained in:
Bastien Nocera 2012-11-23 18:44:58 +01:00
parent 781bda8e12
commit 3eb6cdd1bc
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -34,6 +34,8 @@
#include "gdm-languages.h" #include "gdm-languages.h"
static char *get_lang_for_user_object_path (const char *path);
static gint static gint
cc_common_language_sort_languages (GtkTreeModel *model, cc_common_language_sort_languages (GtkTreeModel *model,
GtkTreeIter *a, GtkTreeIter *a,
@ -315,8 +317,15 @@ gchar *
cc_common_language_get_current_language (void) cc_common_language_get_current_language (void)
{ {
gchar *language; gchar *language;
char *path;
const gchar *locale; const gchar *locale;
path = g_strdup_printf ("/org/freedesktop/Accounts/User%d", getuid ());
language = get_lang_for_user_object_path (path);
g_free (path);
if (language != NULL && *language != '\0')
return language;
locale = (const gchar *) setlocale (LC_MESSAGES, NULL); locale = (const gchar *) setlocale (LC_MESSAGES, NULL);
if (locale) if (locale)
language = gdm_normalize_language_name (locale); language = gdm_normalize_language_name (locale);