on xenial help sign in
detect languages from the SIM card(s), if present

otherwise fallback to "en"

commit989236bdc0b01f9b8db835c9e2484d03cdf038d4 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateFri 3 Jul 2015, 16:23 (11 years ago) parent0ffae8d
3 files changed+20−5
qml/Wizard/Pages/10-language.qml+17−4 tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qml+2 tests/qmltests/Wizard/tst_Wizard.qml+1−1
qml/Wizard/Pages/10-language.qml+17−4
@@ -26,15 +26,28 @@ LocalComponents.Page {
2626 title: i18n.tr("Language")
2727 forwardButtonSourceComponent: forwardButton
2828
29− property var detectedLangs: []
29+ property var detectedLangs: ["en"]
3030
3131 UbuntuLanguagePlugin {
3232 id: plugin
3333 }
3434
35− Component.onCompleted: {
36− detectedLangs = ["fr", "de", "it"] // FIXME pass a list of detected languages here
37− populateModel(detectedLangs.length > 0 ? true : false, detectedLangs.length > 0 ? detectedLangs : ["en"]);
35+ Connections {
36+ target: modemManager
37+ onModemsChanged: {
38+ print("Modems changed")
39+ if (simManager0.present && simManager0.preferredLanguages.length > 0) {
40+ detectedLangs = simManager0.preferredLanguages
41+ } else if (simManager1.present && simManager1.preferredLanguages.length > 0) {
42+ detectedLangs = simManager1.preferredLanguages
43+ } else {
44+ //detectedLangs = ["de", "fr", "it"]
45+ }
46+
47+ print("Detected langs: " + detectedLangs)
48+
49+ populateModel(true, detectedLangs);
50+ }
3851 }
3952
4053 function populateModel(onlyDetected, detectedLangs)
tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qml+2
@@ -23,6 +23,7 @@ Item {
2323 property string modemPath
2424 readonly property alias present: d.present
2525 readonly property alias ready: d.ready
26+ readonly property var preferredLanguages: ["de", "fr", "it", "en"]
2627
2728 QtObject {
2829 id: d
@@ -31,6 +32,7 @@ Item {
3132 property bool ready: false
3233
3334 function updatePresence() {
35+ print("Update presence")
3436 d.present = MockQOfono.isModemPresent(simManager.modemPath)
3537 d.ready = MockQOfono.isModemReady(simManager.modemPath);
3638 }
tests/qmltests/Wizard/tst_Wizard.qml+1−1
@@ -19,7 +19,7 @@ import QtTest 1.0
1919import AccountsService 0.1
2020import MeeGo.QOfono 0.2
2121import QMenuModel 0.1
22−import Ubuntu.Components 1.1
22+import Ubuntu.Components 1.2
2323import Ubuntu.SystemSettings.SecurityPrivacy 1.0
2424import Unity.Test 0.1 as UT
2525import Wizard 0.1