From f138c34b9eedc91aeb00fecc5d9f72d99f7992d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Thu, 7 May 2015 15:15:26 +0200 Subject: [PATCH] Fix i18n on Windows --- gtk/main.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/gtk/main.c b/gtk/main.c index 1c85c6ab3..c73c57ec2 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -2071,29 +2071,25 @@ int main(int argc, char *argv[]){ /*for pulseaudio:*/ g_setenv("PULSE_PROP_media.role", "phone", TRUE); #endif + lang=linphone_gtk_get_lang(config_file); if (lang == NULL || lang[0]=='\0'){ - lang = g_getenv("LANG"); + lang = g_getenv("LANGUAGE"); + if (!lang) lang = g_getenv("LANG"); } if (lang && lang[0]!='\0'){ #ifdef WIN32 if (strncmp(lang,"zh",2)==0){ workaround_gtk_entry_chinese_bug=TRUE; } -#else - g_setenv("LANG",lang,1); - g_setenv("LANGUAGE",lang,1); #endif + g_setenv("LANGUAGE",lang,1); } #ifdef ENABLE_NLS + setlocale(LC_ALL, ""); bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); -#ifdef WIN32 - setlocale(LC_ALL,lang ? lang : ""); -#else - setlocale(LC_ALL,""); -#endif /*do not use textdomain(): this sets a global default domain. On Mac OS bundle, it breaks gtk translations (obscure bug somewhere)*/ /*textdomain (GETTEXT_PACKAGE);*/