@@ -49,14 +49,14 @@ LocalComponents.Page {
49 var detectedLang = "";
49 var detectedLang = "";
50 // try to detect the language from the SIM card
50 // try to detect the language from the SIM card
51 if (simManager0.present && simManager0.preferredLanguages.length > 0) {
51 if (simManager0.present && simManager0.preferredLanguages.length > 0) {
52− detectedLang = simManager0.preferredLanguages[0];
52+ detectedLang = simManager0.preferredLanguages[0] + "_" + LocalePlugin.mccToCountryCode(simManager0.mobileCountryCode);
53 print("SIM 0 detected lang:", detectedLang);
53 print("SIM 0 detected lang:", detectedLang);
54 } else if (simManager1.present && simManager1.preferredLanguages.length > 0) {
54 } else if (simManager1.present && simManager1.preferredLanguages.length > 0) {
55− detectedLang = simManager1.preferredLanguages[0];
55+ detectedLang = simManager1.preferredLanguages[0] + "_" + LocalePlugin.mccToCountryCode(simManager1.mobileCountryCode);
56 print("SIM 1 detected lang:", detectedLang);
56 print("SIM 1 detected lang:", detectedLang);
57 } else if (plugin.currentLanguage != -1) {
57 } else if (plugin.currentLanguage != -1) {
58− detectedLang = plugin.currentLanguage;
58+ detectedLang = plugin.languageCodes[plugin.currentLanguage];
59− print("Using current language", plugin.currentLanguage, "as default");
59+ print("Using current language", detectedLang, "as default");
61 print("No lang detected, falling back to default (en_US)");
61 print("No lang detected, falling back to default (en_US)");
62 detectedLang = "en_US"; // fallback to default lang
62 detectedLang = "en_US"; // fallback to default lang
@@ -81,7 +81,7 @@ LocalComponents.Page {
81 id: languagesListView
81 id: languagesListView
82 boundsBehavior: Flickable.StopAtBounds
82 boundsBehavior: Flickable.StopAtBounds
83 clip: true
83 clip: true
84− currentIndex: -1
84+ currentIndex: plugin.currentLanguage
85 snapMode: ListView.SnapToItem
85 snapMode: ListView.SnapToItem