Merge lp:~lukas-kde/unity8/chineseInputOSK into lp:unity8

[Lukáš Tinkl]

Select correct Chinese input method for OSK in the wizard

Select correct Chinese input method for OSK in the wizard

Fixes lp:1588633

* Are there any related MPs required for this MP to build/function as expected? Please list.

No

* Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

* If you changed the UI, has there been a design review?

N/A

[Michael Terry (mterry)]

LGTM. Watched Lukas play with it on his phone.

Minor nit in mock that Hongkong should be "Hong Kong", but I'm not blocking on that.

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2442
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1411/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/1877
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/957
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/957
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/957
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1903
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1840
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1840
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1840
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1831
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1831/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1831
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1831/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1831
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1831/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1831
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1831/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1831
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1831/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1831
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1831/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1831
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1831/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1831
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1831/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1831
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1831/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1411/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Wizard/Pages/10-welcome.qml'
--- qml/Wizard/Pages/10-welcome.qml	2016-03-29 03:47:39 +0000
+++ qml/Wizard/Pages/10-welcome.qml	2016-06-06 15:16:25 +0000
@@ -61,6 +61,21 @@
         }
     }
 
+    function applyOSKSettings(locale) {
+        var language = locale.split("_")[0].split(".")[0];
+        var oskLanguage = language;
+
+        if (language === "zh") { // special case for Chinese, select either simplified or traditional
+            if (locale.substr(0, 5) === "zh_CN" || locale.substr(0,5) === "zh_SG") {
+                oskLanguage = "zh-hans"; // Chinese Simplified
+            } else {
+                oskLanguage = "zh-hant"; // Chinese Traditional
+            }
+        }
+
+        oskPlugin.setCurrentLayout(oskLanguage);
+    }
+
     // splash screen (this has to be on the first page)
     Image {
         id: splashImage
@@ -158,9 +173,8 @@
             onClicked: {
                 if (plugin.currentLanguage !== languagesListView.currentIndex) {
                     var locale = plugin.languageCodes[languagesListView.currentIndex];
-                    var language = locale.split("_")[0].split(".")[0];
                     plugin.currentLanguage = languagesListView.currentIndex;
-                    oskPlugin.setCurrentLayout(language);
+                    applyOSKSettings(locale);
                     System.updateSessionLocale(locale);
                 }
                 i18n.language = plugin.languageCodes[plugin.currentLanguage]; // re-notify of change after above call (for qlocale change)
@@ -169,8 +183,7 @@
                         (root.simManager0.present && root.simManager0.ready) || (root.simManager1.present && root.simManager1.ready) ||
                         root.seenSIMPage) { // go to next page
                     pageStack.next();
-                }
-                else {
+                } else {
                     pageStack.load(Qt.resolvedUrl("sim.qml")); // show the SIM page
                 }
             }

=== modified file 'tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qml'
--- tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qml	2016-03-29 03:47:39 +0000
+++ tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qml	2016-06-06 15:16:25 +0000
@@ -17,7 +17,8 @@
 import QtQuick 2.4
 
 Item {
-    property var languageNames: ["English (United States)", "French (France)", "Spanish (Spain)"]
-    property var languageCodes: ["en_US", "fr_FR", "es_ES"]
+    property var languageNames: ["English (United States)", "French (France)", "Spanish (Spain)", "Spanish (Mexico)",
+        "German (Switzerland)", "Czech (Czechia)", "Chinese (Hongkong)", "Chinese (Singapore)", "Chinese (China)"]
+    property var languageCodes: ["en_US", "fr_FR", "es_ES", "es_MX", "de_CH", "cs_CZ", "zh_HK", "zh_SG", "zh_CN"]
     property int currentLanguage: 0
 }