Lubuntu/installer-prompt
10
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Don't default to C, and be somewhat reasonable about locales, to start.

Browse Source
This commit is contained in:
Simon Quigley 2023-12-23 17:53:11 -06:00
parent 651dc812c9
commit 7ac27098cf
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/installerprompt.cpp
View File

@ -376,10 +376,15 @@ QString InstallerPrompt::getDisplayNameForLocale(const QLocale &locale) {
return s; return s;
}; };
QLocale currentAppLocale = QLocale::system();
QString nativeName = locale.nativeLanguageName(); QString nativeName = locale.nativeLanguageName();
QString nativeCountryName = sanitize(locale.nativeCountryName()); QString nativeCountryName = sanitize(locale.nativeCountryName());
QString englishLanguageName = QLocale::languageToString(locale.language()); QString englishLanguageName = currentAppLocale.languageToString(locale.language());
QString englishCountryName = sanitize(QLocale::countryToString(locale.country())); QString englishCountryName = sanitize(currentAppLocale.countryToString(locale.country()));
if (nativeName.isEmpty() || nativeCountryName.isEmpty()) {
return QString();
}
// Rename "American English" to "English" // Rename "American English" to "English"
if (locale.language() == QLocale::English) { if (locale.language() == QLocale::English) {
@ -419,31 +424,29 @@ void InstallerPrompt::initLanguageComboBox() {
} }
QStringList InstallerPrompt::getAvailableLanguages() { QStringList InstallerPrompt::getAvailableLanguages() {
QMap<QString, QString> languageMap; // Default sorting by QString is case-sensitive QMap<QString, QString> language_map; // Default sorting by QString is case-sensitive
for (int language = QLocale::C; language <= QLocale::LastLanguage; ++language) { QList<QLocale> all_locales = QLocale::matchingLocales(QLocale::AnyLanguage, QLocale::AnyScript, QLocale::AnyCountry);
foreach (int country, QLocale::countriesForLanguage(static_cast<QLocale::Language>(language))) { for (const QLocale &locale : all_locales) {
QLocale locale(static_cast<QLocale::Language>(language), static_cast<QLocale::Country>(country)); QString display_name = getDisplayNameForLocale(locale);
if (display_name.isEmpty()) continue;
QString displayName = getDisplayNameForLocale(locale); language_map.insert(display_name, locale.name());
if (displayName.isEmpty()) continue;
languageMap.insert(displayName, locale.name());
}
} }
// Sort the language display names // Sort the language display names
QStringList sortedLanguages = languageMap.keys(); QStringList sorted_languages = language_map.keys();
std::sort(sortedLanguages.begin(), sortedLanguages.end(), [](const QString &a, const QString &b) { std::sort(sorted_languages.begin(), sorted_languages.end(), [](const QString &a, const QString &b) {
return a.compare(b, Qt::CaseInsensitive) < 0; return a.compare(b, Qt::CaseInsensitive) < 0;
}); });
// Clear the existing languageLocaleMap and repopulate it based on sortedLanguages // Clear the existing languageLocaleMap and repopulate it based on sortedLanguages
languageLocaleMap.clear(); languageLocaleMap.clear();
for (const QString &languageName : sortedLanguages) { for (const QString &language_name : sorted_languages) {
languageLocaleMap.insert(languageName, languageMap[languageName]); languageLocaleMap.insert(language_name, language_map[language_name]);
} }
return sortedLanguages; return sorted_languages;
} }
void InstallerPrompt::onLanguageChanged(int index) { void InstallerPrompt::onLanguageChanged(int index) {