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

Fix loading language from system UI languages

Browse Source 
Fixes #1847
This commit is contained in:
Jonas Kvinge
2025-10-30 23:54:42 +01:00
parent 0537b072fe
commit a4de7559ac
3 changed files with 65 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/main.cpp
View File

@@ -260,46 +260,76 @@ int main(int argc, char *argv[]) {
IconLoader::Init();
#ifdef HAVE_TRANSLATIONS
QString language = options.language();
if (language.isEmpty()) {
Settings s;
s.beginGroup(BehaviourSettings::kSettingsGroup);
language = s.value(BehaviourSettings::kLanguage).toString();
s.endGroup();
QStringList languages;
// Load language from command line options
if (!options.language().isEmpty()) {
languages << options.language();
}
if (language.isEmpty()) {
// Load language from settings
if (languages.isEmpty()) {
Settings s;
s.beginGroup(BehaviourSettings::kSettingsGroup);
const QString language = s.value(BehaviourSettings::kLanguage).toString();
s.endGroup();
if (!language.isEmpty()) {
languages << language;
}
}
// Use system UI languages
if (languages.isEmpty()) {
#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
const QStringList system_languages = QLocale::system().uiLanguages(QLocale::TagSeparator::Underscore);
languages = QLocale::system().uiLanguages(QLocale::TagSeparator::Underscore);
#else
const QStringList system_languages = QLocale::system().uiLanguages();
#endif
if (system_languages.isEmpty()) {
language = QLocale::system().name();
for (const QString &language : system_languages) {
QString language_underscore = language;
language_underscore = language_underscore.replace(u'-', u'_');
languages << language_underscore;
}
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
}
}
if (languages.isEmpty()) {
languages << QLocale::system().name();
}
ScopedPtr<Translations> translations(new Translations);
translations->LoadTranslation(u"qt"_s, QLibraryInfo::path(QLibraryInfo::TranslationsPath), language);
translations->LoadTranslation(u"strawberry"_s, u":/i18n"_s, language);
translations->LoadTranslation(u"strawberry"_s, QStringLiteral(TRANSLATIONS_DIR), language);
translations->LoadTranslation(u"strawberry"_s, QCoreApplication::applicationDirPath(), language);
translations->LoadTranslation(u"strawberry"_s, QDir::currentPath(), language);
for (const QString &language : std::as_const(languages)) {
if (translations->LoadTranslation(u"qt"_s, QLibraryInfo::path(QLibraryInfo::TranslationsPath), language)) {
break;
}
}
static const QStringList language_paths = QStringList() << u":/i18n"_s
<< QStringLiteral(TRANSLATIONS_DIR)
<< QCoreApplication::applicationDirPath()
<< QDir::currentPath();
for (const QString &language : std::as_const(languages)) {
bool language_loaded = false;
for (const QString &language_path : language_paths) {
if (translations->LoadTranslation(u"strawberry"_s, language_path, language)) {
language_loaded = true;
break;
}
}
if (language_loaded) {
break;
}
}
# ifdef HAVE_QTSPARKLE
qtsparkle::LoadTranslations(language);
if (!languages.isEmpty()) {
qtsparkle::LoadTranslations(languages.first());
}
# endif
#endif
#endif // HAVE_TRANSLATIONS
Application app;