0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sort system locale to front of list

Browse Source
This commit is contained in:
Philipp David 2022-01-13 10:20:53 +01:00
parent 2dd2555a63
commit b9beb3c7d2
No known key found for this signature in database
GPG Key ID: 967A5D5EB5071577
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
launcher/translations/TranslationsModel.cpp
View File

@ -144,6 +144,9 @@ struct TranslationsModel::Private
std::unique_ptr<POTranslator> m_po_translator; std::unique_ptr<POTranslator> m_po_translator;
QFileSystemWatcher *watcher; QFileSystemWatcher *watcher;
const QString m_system_locale = QLocale::system().name();
const QString m_system_language = m_system_locale.split('_').front();
bool no_language_set = false; bool no_language_set = false;
}; };
@ -170,12 +173,12 @@ void TranslationsModel::translationDirChanged(const QString& path)
if (d->no_language_set) if (d->no_language_set)
{ {
auto bcp47Name = QLocale::system().name(); auto language = d->m_system_locale;
if (!findLanguage(bcp47Name)) if (!findLanguage(language))
{ {
bcp47Name = bcp47Name.split('_').front(); language = d->m_system_language;
} }
selectLanguage(bcp47Name); selectLanguage(language);
if (selectedLanguage() != defaultLangCode) if (selectedLanguage() != defaultLangCode)
{ {
updateLanguage(selectedLanguage()); updateLanguage(selectedLanguage());
@ -340,8 +343,19 @@ void TranslationsModel::reloadLocalFiles()
{ {
d->m_languages.append(language); d->m_languages.append(language);
} }
std::sort(d->m_languages.begin(), d->m_languages.end(), [](const Language& a, const Language& b) { std::sort(d->m_languages.begin(), d->m_languages.end(), [this](const Language& a, const Language& b) {
return a.key.compare(b.key) < 0; if (a.key != b.key)
{
if (a.key == d->m_system_locale || a.key == d->m_system_language)
{
return true;
}
if (b.key == d->m_system_locale || b.key == d->m_system_language)
{
return false;
}
}
return a.key < b.key;
}); });
endInsertRows(); endInsertRows();
} }