git.iko.soy/unity8
on xenial help sign in
select country
9286c50Lukáš Tinkl
qml/Wizard/Pages/15-country.qml+4−4
compare with xenial
unifiedsplit
@@ -25,7 +25,7 @@ LocalComponents.Page {
25 title: i18n.tr("Country")
25 title: i18n.tr("Country")
26 forwardButtonSourceComponent: forwardButton
26 forwardButtonSourceComponent: forwardButton
27
27
28− property string selectedLocale: ""
28+ property string selectedCountry: ""
29 readonly property var preferedCountries: LocalePlugin.countriesForLanguage(root.language)
29 readonly property var preferedCountries: LocalePlugin.countriesForLanguage(root.language)
30
30
31 Component.onCompleted: {
31 Component.onCompleted: {
@@ -62,7 +62,7 @@ LocalComponents.Page {
62
62
63 function selectCountry(code, index)
63 function selectCountry(code, index)
64 {
64 {
65− selectedLocale = root.language + "_" + code
65+ selectedCountry = code
66 regionsListView.currentIndex = index
66 regionsListView.currentIndex = index
67 }
67 }
68
68
@@ -139,7 +139,7 @@ LocalComponents.Page {
139
139
140 onClicked: {
140 onClicked: {
141 selectCountry(code, index)
141 selectCountry(code, index)
142− print("Selected locale: " + selectedLocale)
142+ print("Selected country: " + selectedCountry)
143 print("Current index: " + ListView.view.currentIndex)
143 print("Current index: " + ListView.view.currentIndex)
144 }
144 }
145 }
145 }
@@ -150,7 +150,7 @@ LocalComponents.Page {
150 id: forwardButton
150 id: forwardButton
151 LocalComponents.StackButton {
151 LocalComponents.StackButton {
152 text: i18n.tr("Next")
152 text: i18n.tr("Next")
153− enabled: selectedLocale !== ""
153+ enabled: selectedCountry !== ""
154 onClicked: {
154 onClicked: {
155 // if (selectedLanguage !== plugin.languageCodes[plugin.currentLanguage]) {
155 // if (selectedLanguage !== plugin.languageCodes[plugin.currentLanguage]) {
156 // //plugin.currentLanguage = listview.currentIndex; // setting system language by some magic index? wtf
156 // //plugin.currentLanguage = listview.currentIndex; // setting system language by some magic index? wtf
qml/Wizard/Pages/40-timezone.qml+1−1
@@ -105,7 +105,7 @@ LocalComponents.Page {
105 id: searchField
105 id: searchField
106 anchors.left: parent.left
106 anchors.left: parent.left
107 anchors.right: parent.right
107 anchors.right: parent.right
108− placeholderText: i18n.tr("Enter your city")
108+ placeholderText: i18n.tr("Enter your city or country")
109 color: UbuntuColors.darkGrey
109 color: UbuntuColors.darkGrey
110 }
110 }
111
111