* use the osso-email translation domain for the osso 1.1 version

pmo-trunk-r1767

diff --git a/debian/control-maemo1 b/debian/control-maemo1
index 4616315..49d7ab6 100644 (file)
--- a/debian/control-maemo1
+++ b/debian/control-maemo1
@@ -7,7 +7,7 @@ Standards-Version: 3.6.0
 
 Package: modest
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, modest-providers-data
+Depends: ${shlibs:Depends}, ${misc:Depends}, modest-providers-data, osso-email-l10n-mr0 | osso-email-l10n-mr,osso-icons-theme 
 Description: an e-mail client for platforms with modest resources
 
 #Package: modest-dbg

diff --git a/src/modest-init.c b/src/modest-init.c
index ecd79b9..72f787c 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -429,11 +429,19 @@ init_debug_logging (void)
 static void
 init_i18n (void)
 {
+       const gchar* gettext_package;
        /* Setup gettext, to use our .po files: */
        /* GETTEXT_PACKAGE and MODEST_LOCALE_DIR are defined in config.h */
-       bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALE_DIR);
-       bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-       textdomain (GETTEXT_PACKAGE);
+#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);
 }