- const gchar* gettext_package;
- /* Setup gettext, to use our .po files: */
- /* GETTEXT_PACKAGE and MODEST_LOCALE_DIR are defined in config.h */
-#ifdef MODEST_HILDON_VERSION_0
- gettext_package = GETTEXT_PACKAGE;
- bindtextdomain (gettext_package, MODEST_LOCALE_DIR);
-#else
- gettext_package = "osso-email"; /* HACK to use the localizations */
- bindtextdomain (gettext_package, "/usr/share/locale");
-#endif /*MODEST_HILDON_VERSION_0*/
-
- bind_textdomain_codeset (gettext_package, "UTF-8");
- textdomain (gettext_package);
+ const gchar *lc_messages = setlocale (LC_MESSAGES, NULL);
+
+ if (!lc_messages) {
+ setenv ("LANGUAGE", "en_GB", 1);
+ setenv ("LC_MESSAGES", "en_GB", 1);
+#ifdef MODEST_PLATFORM_GNOME
+ } else {
+ gchar *new_lc_messages;
+ new_lc_messages = g_strconcat (lc_messages, ":en_GB", NULL);
+ setenv ("LANGUAGE", new_lc_messages, 1);
+ setenv ("LC_MESSAGES", new_lc_messages, 1);
+ g_free (new_lc_messages);
+#endif
+ }
+
+ bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALE_DIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ textdomain (GETTEXT_PACKAGE);