git.iko.soy/unity8
on xenial help sign in
Set current layout when setting language
a07176bMichael Terry
qml/Wizard/Pages/10-welcome.qml+8−1
compare with xenial
unifiedsplit
@@ -31,6 +31,10 @@ LocalComponents.Page {
31 id: plugin
31 id: plugin
32 }
32 }
33
33
34+ OnScreenKeyboardPlugin {
35+ id: oskPlugin
36+ }
37+
34 function init()
38 function init()
35 {
39 {
36 var detectedLang = "";
40 var detectedLang = "";
@@ -153,8 +157,11 @@ LocalComponents.Page {
153 enabled: languagesListView.currentIndex != -1
157 enabled: languagesListView.currentIndex != -1
154 onClicked: {
158 onClicked: {
155 if (plugin.currentLanguage !== languagesListView.currentIndex) {
159 if (plugin.currentLanguage !== languagesListView.currentIndex) {
160+ var locale = plugin.languageCodes[languagesListView.currentIndex];
161+ var language = locale.split("_")[0].split(".")[0];
156 plugin.currentLanguage = languagesListView.currentIndex;
162 plugin.currentLanguage = languagesListView.currentIndex;
163+ oskPlugin.setCurrentLayout(language);
157− System.updateSessionLocale(plugin.languageCodes[plugin.currentLanguage]);
164+ System.updateSessionLocale(locale);
158 }
165 }
159 i18n.language = plugin.languageCodes[plugin.currentLanguage]; // re-notify of change after above call (for qlocale change)
166 i18n.language = plugin.languageCodes[plugin.currentLanguage]; // re-notify of change after above call (for qlocale change)
160
167