on xenial help sign in
present the languages in their native name

sort them case-insensitively

commit731d64942b3a8d766dbd8ceae461ccbe1c6f447f authorLukáš Tinkl <lukas.tinkl@canonical.com> dateTue 21 Jul 2015, 17:49 (11 years ago) parent17d1da9
3 files changed+5−5
plugins/Wizard/LocalePlugin.cpp+4−3 qml/Wizard/Pages/10-language.qml+1−1 qml/Wizard/Pages/50-timezone.qml−1
plugins/Wizard/LocalePlugin.cpp+4−3
@@ -294,9 +294,10 @@ LocaleAttached::LocaleAttached(QObject* parent)
294294QJsonObject LocaleAttached::languages() const
295295{
296296 QJsonObject result;
297− for (int i = QLocale::C + 1; i < QLocale::LastLanguage; ++i) {
298− QLocale loc(static_cast<QLocale::Language>(i));
299− result.insert(loc.name().split('_').first(), QLocale::languageToString(loc.language()));
297+
298+ const QList<QLocale> allLocales = QLocale::matchingLocales(QLocale::AnyLanguage, QLocale::AnyScript, QLocale::AnyCountry);
299+ Q_FOREACH(const QLocale &loc, allLocales) {
300+ result.insert(loc.name().split('_').first(), loc.nativeLanguageName());
300301 }
301302
302303 return result;
qml/Wizard/Pages/10-language.qml+1−1
@@ -71,7 +71,7 @@ LocalComponents.Page {
7171 return
7272 })
7373 .sort(function(a, b) { // sort by language name
74− return a.language.localeCompare(b.language);
74+ return a.language.toLocaleLowerCase().localeCompare(b.language.toLocaleLowerCase()); // sort languages case insensitively
7575 })
7676 .forEach(function(lang) { // build the model
7777 if (lang.code === "C") {
qml/Wizard/Pages/50-timezone.qml−1
@@ -41,7 +41,6 @@ LocalComponents.Page {
4141
4242 Component.onCompleted: {
4343 theme.palette.normal.backgroundText = "#525252" // "fix" the placeholder text in the search field
44− searchField.forceActiveFocus()
4544 }
4645
4746 Component {