Select the region in the easysetup wizard based on device's regional

[modest] / src / modest-utils.c

diff --git a/src/modest-utils.c b/src/modest-utils.c
index 40bb816..f56a3a8 100644 (file)
--- a/src/modest-utils.c
+++ b/src/modest-utils.c
@@ -934,7 +934,9 @@ modest_utils_fill_country_model (GtkTreeModel *model, gint *locale_mcc)
        }
 
        /* Get the territory specified for the current locale */
        }
 
        /* Get the territory specified for the current locale */

-       territory = nl_langinfo (_NL_ADDRESS_COUNTRY_NAME);
+       territory = nl_langinfo (_NL_IDENTIFICATION_TERRITORY);
+
+       setlocale (LC_MESSAGES, "en_GB");

 
        while (fgets (line, MCC_FILE_MAX_LINE_LEN, file) != NULL) {
                int mcc;
 
        while (fgets (line, MCC_FILE_MAX_LINE_LEN, file) != NULL) {
                int mcc;

@@ -959,6 +961,8 @@ modest_utils_fill_country_model (GtkTreeModel *model, gint *locale_mcc)
                }
        }
 
                }
        }
 

+       setlocale (LC_MESSAGES, "");
+

        /* Now we fill the model */
        rewind (file);
        country_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
        /* Now we fill the model */
        rewind (file);
        country_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);