on xenial help sign in
improve lang detection vs. default language logic
commit48b3df763c702811c4573be49b5de9217b9aea49 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateMon 13 Jul 2015, 15:50 (11 years ago) parentcaf7581
1 file changed+4−3
qml/Wizard/Pages/10-language.qml+4−3
qml/Wizard/Pages/10-language.qml+4−3
@@ -26,7 +26,7 @@ LocalComponents.Page {
2626 title: i18n.tr("Language")
2727 forwardButtonSourceComponent: forwardButton
2828
29− property var detectedLangs: ["en"] // default language
29+ readonly property string defaultLanguage: "en" // default language
3030
3131 UbuntuLanguagePlugin {
3232 id: plugin
@@ -36,17 +36,18 @@ LocalComponents.Page {
3636 target: modemManager
3737 onModemsChanged: {
3838 print("Modems changed")
39+ var detectedLangs = []
3940 if (simManager0.present && simManager0.preferredLanguages.length > 0) {
4041 detectedLangs = simManager0.preferredLanguages
4142 } else if (simManager1.present && simManager1.preferredLanguages.length > 0) {
4243 detectedLangs = simManager1.preferredLanguages
4344 } else {
44− //detectedLangs = ["fr"]
45+ detectedLangs = [defaultLanguage] // fallback to default lang
4546 }
4647
4748 print("Detected langs: " + detectedLangs)
4849
49− populateModel(true, detectedLangs);
50+ populateModel(false, detectedLangs)
5051 }
5152 }
5253