Use the proper translation for fetching country names and improve mcc detection.

[modest] / src / hildon2 / modest-platform.c

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index de71edf..18db4b3 100644 (file)
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -134,9 +134,16 @@ on_modest_conf_update_interval_changed (ModestConf* self,
 static gboolean
 check_required_files (void)
 {
-       FILE *mcc_file = modest_utils_open_mcc_mapping_file (NULL);
+       FILE *mcc_file = modest_utils_open_mcc_mapping_file (FALSE, NULL);
        if (!mcc_file) {
-               g_printerr ("modest: check for mcc file failed\n");
+               g_printerr ("modest: check for mcc file (for LANG) failed\n");
+               return FALSE;
+       } else 
+               fclose (mcc_file);
+       
+       mcc_file = modest_utils_open_mcc_mapping_file (TRUE, NULL);
+       if (!mcc_file) {
+               g_printerr ("modest: check for mcc file (for LC_MESSAGES) failed\n");
                return FALSE;
        } else 
                fclose (mcc_file);