X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-init.c;h=e81aa98fed9e033dc95be030f711a2523bf10293;hp=a4b55c66d524c6641ee455484660d84a6ea30553;hb=c6e92e9c0075505a97acc092ee6ac7d694b4b6f2;hpb=2b58f5abfb171a82424c14cd9777ea5ee460db61

diff --git a/src/modest-init.c b/src/modest-init.c
index a4b55c6..e81aa98 100644
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -551,31 +551,26 @@ init_debug_logging (void)
 static void
 init_i18n (void)
 {
-	const gchar* gettext_package;
-
-#ifdef MODEST_PLATFORM_MAEMO
-	/* little trick make en_GB the fallback language, instead
-	 * of the logical IDs
-	 * we need the ugly ifdefs, because modest_platform_init is
-	 * too late.
-	 */
-	const gchar *lang = getenv ("LANG");
-	if (!lang) 
+       /* little trick make en_GB the fallback language, instead
+        * of the logical IDs
+        * we need the ugly ifdefs, because modest_platform_init is
+        * too late.
+        */
+	const gchar *lc_messages = getenv ("LC_MESSAGES");
+
+	if (!lc_messages) {
 		setenv ("LANGUAGE", "en_GB", 1);
-	else {
-		gchar *language = g_strdup_printf ("%s:en_GB", lang);
-		setenv ("LANGUAGE", language, 1);
-		g_free (language);
+		setenv ("LC_MESSAGES", "en_GB", 1);
+	} else {
+		gchar *language = g_strdup_printf ("%s:en_GB", lc_messages);
+               setenv ("LANGUAGE", language, 1);
+               g_free (language);
 	}
 	/* end of little trick */
-#endif /*MODEST_PLATFORM_MAEMO */
-	
-	gettext_package = GETTEXT_PACKAGE;
-
-	bind_textdomain_codeset (gettext_package, "UTF-8");
-	textdomain (gettext_package);
 
-	setlocale (LC_ALL, "");
+	bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALE_DIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
 }