@@ -29,26 +29,22 @@ LocalComponents.Page {
2929 readonly property var preferedCountries: LocalePlugin.countriesForLanguage(root.language)
3030
3131 Component.onCompleted: {
32− populateModel(preferedCountries, "CH"); // FIXME pass the detected country code here
32+ populateModel(preferedCountries);
3333 }
3434
35− function populateModel(preferedCountries, detectedCountry)
35+ function populateModel(preferedCountries)
3636 {
37− console.log("RegionPage::populateModel: detected country:" + detectedCountry);
38− var index = 0;
3937 var countries = LocalePlugin.countries();
4038 //console.log("All countries:" + countries);
4139 Object.keys(countries).map(function(code) { // prepare the object
4240 //console.log("Got country:" + code);
4341 return { "code": code, "country": countries[code] || code,
44− "dept": code === detectedCountry ? i18n.tr("Detected") : Object.keys(preferedCountries).indexOf(code) !== -1 ? i18n.tr("Prefered") : i18n.tr("All") };
42+ "dept": Object.keys(preferedCountries).indexOf(code) !== -1 ? i18n.tr("Prefered") : i18n.tr("All") };
4543 })
4644 .sort(function(a, b) { // group by status, sort by country name
4745 if (a.dept === b.dept) {
4846 return a.country.localeCompare(b.country);
49− } else if (a.dept === i18n.tr("Detected")) {
50− return -1
51− } else if (a.dept === i18n.tr("Prefered") && b.dept === i18n.tr("All")) {
47+ } else if (a.dept === i18n.tr("Prefered")) {
5248 return -1
5349 }
5450 return 1
@@ -59,11 +55,6 @@ LocalComponents.Page {
5955 return;
6056 }
6157 model.append(country);
62− if (country.code === detectedCountry) { // preselect the detected country
63− selectCountry(country.code, index)
64− //regionsListView.positionViewAtIndex(index, ListView.Center)
65− }
66− index++;
6758 });
6859 busyIndicator.running = false;
6960 busyIndicator.visible = false;