dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

main: Use QLocale::TagSeparator::Underscore

Browse Source
This commit is contained in:
Jonas Kvinge
2024-10-05 15:43:29 +02:00
parent e12f27a945
commit 056d8817b2
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main.cpp
View File

@@ -249,19 +249,32 @@ int main(int argc, char *argv[]) {
IconLoader::Init(); IconLoader::Init();
#ifdef HAVE_TRANSLATIONS #ifdef HAVE_TRANSLATIONS
QString override_language = options.language(); QString language = options.language();
if (override_language.isEmpty()) { if (language.isEmpty()) {
Settings s; Settings s;
s.beginGroup(BehaviourSettingsPage::kSettingsGroup); s.beginGroup(BehaviourSettingsPage::kSettingsGroup);
override_language = s.value("language").toString(); language = s.value("language").toString();
s.endGroup(); s.endGroup();
} }
QString system_language = QLocale::system().uiLanguages().empty() ? QLocale::system().name() : QLocale::system().uiLanguages().first(); if (language.isEmpty()) {
// uiLanguages returns strings with "-" as separators for language/region; however QTranslator needs "_" separators #if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
system_language.replace(u'-', u'_'); const QStringList system_languages = QLocale::system().uiLanguages(QLocale::TagSeparator::Underscore);
#else
const QString language = override_language.isEmpty() ? system_language : override_language; const QStringList system_languages = QLocale::system().uiLanguages();
#endif
if (system_languages.isEmpty()) {
language = QLocale::system().name();
}
else {
#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
language = system_languages.first();
#else
language = system_languages.first();
language = language.replace(u'-', u'_');
#endif
}
}
ScopedPtr<Translations> translations(new Translations); ScopedPtr<Translations> translations(new Translations);