on xenial help sign in
select country
commit9286c50ae9e2430853c19b805cdfca4d412a2cd9 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateFri 3 Jul 2015, 17:18 (11 years ago) parent989236b
2 files changed+5−5
qml/Wizard/Pages/15-country.qml+4−4 qml/Wizard/Pages/40-timezone.qml+1−1
qml/Wizard/Pages/15-country.qml+4−4
@@ -25,7 +25,7 @@ LocalComponents.Page {
2525 title: i18n.tr("Country")
2626 forwardButtonSourceComponent: forwardButton
2727
28− property string selectedLocale: ""
28+ property string selectedCountry: ""
2929 readonly property var preferedCountries: LocalePlugin.countriesForLanguage(root.language)
3030
3131 Component.onCompleted: {
@@ -62,7 +62,7 @@ LocalComponents.Page {
6262
6363 function selectCountry(code, index)
6464 {
65− selectedLocale = root.language + "_" + code
65+ selectedCountry = code
6666 regionsListView.currentIndex = index
6767 }
6868
@@ -139,7 +139,7 @@ LocalComponents.Page {
139139
140140 onClicked: {
141141 selectCountry(code, index)
142− print("Selected locale: " + selectedLocale)
142+ print("Selected country: " + selectedCountry)
143143 print("Current index: " + ListView.view.currentIndex)
144144 }
145145 }
@@ -150,7 +150,7 @@ LocalComponents.Page {
150150 id: forwardButton
151151 LocalComponents.StackButton {
152152 text: i18n.tr("Next")
153− enabled: selectedLocale !== ""
153+ enabled: selectedCountry !== ""
154154 onClicked: {
155155 // if (selectedLanguage !== plugin.languageCodes[plugin.currentLanguage]) {
156156 // //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 {
105105 id: searchField
106106 anchors.left: parent.left
107107 anchors.right: parent.right
108− placeholderText: i18n.tr("Enter your city")
108+ placeholderText: i18n.tr("Enter your city or country")
109109 color: UbuntuColors.darkGrey
110110 }
111111