on xenial help sign in
improve lang detection vs. default language logic
48b3df7Lukáš Tinkl
qml/Wizard/Pages/10-language.qml+4−3
@@ -26,7 +26,7 @@ LocalComponents.Page {
26 title: i18n.tr("Language")
26 title: i18n.tr("Language")
27 forwardButtonSourceComponent: forwardButton
27 forwardButtonSourceComponent: forwardButton
28
28
29− property var detectedLangs: ["en"] // default language
29+ readonly property string defaultLanguage: "en" // default language
30
30
31 UbuntuLanguagePlugin {
31 UbuntuLanguagePlugin {
32 id: plugin
32 id: plugin
@@ -36,17 +36,18 @@ LocalComponents.Page {
36 target: modemManager
36 target: modemManager
37 onModemsChanged: {
37 onModemsChanged: {
38 print("Modems changed")
38 print("Modems changed")
39+ var detectedLangs = []
39 if (simManager0.present && simManager0.preferredLanguages.length > 0) {
40 if (simManager0.present && simManager0.preferredLanguages.length > 0) {
40 detectedLangs = simManager0.preferredLanguages
41 detectedLangs = simManager0.preferredLanguages
41 } else if (simManager1.present && simManager1.preferredLanguages.length > 0) {
42 } else if (simManager1.present && simManager1.preferredLanguages.length > 0) {
42 detectedLangs = simManager1.preferredLanguages
43 detectedLangs = simManager1.preferredLanguages
43 } else {
44 } else {
44− //detectedLangs = ["fr"]
45+ detectedLangs = [defaultLanguage] // fallback to default lang
45 }
46 }
46
47
47 print("Detected langs: " + detectedLangs)
48 print("Detected langs: " + detectedLangs)
48
49
49− populateModel(true, detectedLangs);
50+ populateModel(false, detectedLangs)
50 }
51 }
51 }
52 }
52
53