git.iko.soy/unity8
on xenial help sign in
detect languages from the SIM card(s), if present
989236bLukáš Tinkl
qml/Wizard/Pages/10-language.qml+17−4
compare with xenial
unifiedsplit
@@ -26,15 +26,28 @@ LocalComponents.Page {
26 title: i18n.tr("Language")
26 title: i18n.tr("Language")
27 forwardButtonSourceComponent: forwardButton
27 forwardButtonSourceComponent: forwardButton
28
28
29− property var detectedLangs: []
29+ property var detectedLangs: ["en"]
30
30
31 UbuntuLanguagePlugin {
31 UbuntuLanguagePlugin {
32 id: plugin
32 id: plugin
33 }
33 }
34
34
35− Component.onCompleted: {
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 {
36− detectedLangs = ["fr", "de", "it"] // FIXME pass a list of detected languages here
44+ //detectedLangs = ["de", "fr", "it"]
45+ }
46+
47+ print("Detected langs: " + detectedLangs)
48+
37− populateModel(detectedLangs.length > 0 ? true : false, detectedLangs.length > 0 ? detectedLangs : ["en"]);
49+ populateModel(true, detectedLangs);
50+ }
38 }
51 }
39
52
40 function populateModel(onlyDetected, detectedLangs)
53 function populateModel(onlyDetected, detectedLangs)
tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qml+2
@@ -23,6 +23,7 @@ Item {
23 property string modemPath
23 property string modemPath
24 readonly property alias present: d.present
24 readonly property alias present: d.present
25 readonly property alias ready: d.ready
25 readonly property alias ready: d.ready
26+ readonly property var preferredLanguages: ["de", "fr", "it", "en"]
26
27
27 QtObject {
28 QtObject {
28 id: d
29 id: d
@@ -31,6 +32,7 @@ Item {
31 property bool ready: false
32 property bool ready: false
32
33
33 function updatePresence() {
34 function updatePresence() {
35+ print("Update presence")
34 d.present = MockQOfono.isModemPresent(simManager.modemPath)
36 d.present = MockQOfono.isModemPresent(simManager.modemPath)
35 d.ready = MockQOfono.isModemReady(simManager.modemPath);
37 d.ready = MockQOfono.isModemReady(simManager.modemPath);
36 }
38 }
tests/qmltests/Wizard/tst_Wizard.qml+1−1
@@ -19,7 +19,7 @@ import QtTest 1.0
19import AccountsService 0.1
19import AccountsService 0.1
20import MeeGo.QOfono 0.2
20import MeeGo.QOfono 0.2
21import QMenuModel 0.1
21import QMenuModel 0.1
22−import Ubuntu.Components 1.1
22+import Ubuntu.Components 1.2
23import Ubuntu.SystemSettings.SecurityPrivacy 1.0
23import Ubuntu.SystemSettings.SecurityPrivacy 1.0
24import Unity.Test 0.1 as UT
24import Unity.Test 0.1 as UT
25import Wizard 0.1
25import Wizard 0.1