Skip to content

fix(application): Correcting the loading of translation files #9108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
findlayfeng wants to merge 1 commit into
base: master
Choose a base branch
from
+27 −31
Open

fix(application): Correcting the loading of translation files #9108

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 27 additions & 31 deletions src/gui/application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/*
* SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2014 ownCloud GmbH
Expand Down Expand Up @@ -132,7 +132,8 @@
QStringList deleteKeys, ignoreKeys;
AccountManager::backwardMigrationSettingsKeys(&deleteKeys, &ignoreKeys);
FolderMan::backwardMigrationSettingsKeys(&deleteKeys, &ignoreKeys);

configFile.setClientPreviousVersionString(configFile.clientVersionString());

qCDebug(lcApplication) << "Migration is in progress:" << configFile.isMigrationInProgress();
const auto versionChanged = configFile.hasVersionChanged();
if (versionChanged) {
Expand Down Expand Up @@ -998,23 +999,6 @@
_editFileLocallyUrl.clear();
}

QString substLang(const QString &lang)
{
// Map the more appropriate script codes
// to country codes as used by Qt and
// transifex translation conventions.

// Simplified Chinese
if (lang == QLatin1String("zh_Hans")) {
return QLatin1String("zh_CN");
}
// Traditional Chinese
if (lang == QLatin1String("zh_Hant")) {
return QLatin1String("zh_TW");
}
return lang;
}

QString enforcedLanguage()
{
const ConfigFile cfg;
Expand All @@ -1029,11 +1013,6 @@

void Application::setupTranslations()
{
qCInfo(lcApplication) << "System UI languages are:" << QLocale::system().uiLanguages();
const auto enforcedLocale = enforcedLanguage();
const auto lang = substLang(!enforcedLocale.isEmpty() ? enforcedLocale : QLocale::system().uiLanguages(QLocale::TagSeparator::Underscore).first());
qCInfo(lcApplication) << "selected application language:" << lang;

auto *translator = new QTranslator(this);
auto *qtTranslator = new QTranslator(this);
auto *qtkeychainTranslator = new QTranslator(this);
Expand All @@ -1044,19 +1023,36 @@
qCWarning(lcApplication()) << trPath << "folder containing translations is missing. Impossible to load translations";
return;
}
const QString trFile = QLatin1String("client_") + lang;
qCDebug(lcApplication()) << "trying to load" << lang << "in" << trFile << "from" << trPath;
if (translator->load(trFile, trPath) || lang.startsWith(QLatin1String("en"))) {

qCInfo(lcApplication) << "System UI languages are:" << QLocale::system().uiLanguages();
auto choosenLanguage = enforcedLanguage();
if (choosenLanguage.isEmpty()) {
for(const auto &localeToTest : QLocale::system().uiLanguages(QLocale::TagSeparator::Underscore)){
const auto trFile = QString{QLatin1String{"client_"} + localeToTest};
qCDebug(lcApplication()) << "trying to load" << localeToTest << "in" << trFile << "from" << trPath;
if (translator->load(trFile, trPath)) {
choosenLanguage = localeToTest;
break;
}
}
} else {
const QString trFile = QLatin1String("client_") + choosenLanguage;
qCDebug(lcApplication()) << "trying to load" << choosenLanguage << "in" << trFile << "from" << trPath;
static_cast<void>(translator->load(trFile, trPath));
}

qCInfo(lcApplication) << "selected application language:" << choosenLanguage;
if (!translator->isEmpty() || choosenLanguage.startsWith(QLatin1String("en"))) {
// Permissive approach: Qt and keychain translations
// may be missing, but Qt translations must be there in order
// for us to accept the language. Otherwise, we try with the next.
// "en" is an exception as it is the default language and may not
// have a translation file provided.
qCInfo(lcApplication) << "Using" << lang << "translation";
setProperty("ui_lang", lang);
qCInfo(lcApplication) << "Using" << choosenLanguage << "translation";
setProperty("ui_lang", choosenLanguage);
const QString qtTrPath = QLibraryInfo::path(QLibraryInfo::TranslationsPath);
const QString qtTrFile = QLatin1String("qt_") + lang;
const QString qtBaseTrFile = QLatin1String("qtbase_") + lang;
const QString qtTrFile = QLatin1String("qt_") + choosenLanguage;
const QString qtBaseTrFile = QLatin1String("qtbase_") + choosenLanguage;
if (!qtTranslator->load(qtTrFile, qtTrPath)) {
if (!qtTranslator->load(qtTrFile, trPath)) {
if (!qtTranslator->load(qtBaseTrFile, qtTrPath)) {
Expand All @@ -1066,7 +1062,7 @@
}
}
}
const QString qtkeychainTrFile = QLatin1String("qtkeychain_") + lang;
const QString qtkeychainTrFile = QLatin1String("qtkeychain_") + choosenLanguage;
if (!qtkeychainTranslator->load(qtkeychainTrFile, qtTrPath)) {
if (!qtkeychainTranslator->load(qtkeychainTrFile, trPath)) {
qCDebug(lcApplication()) << "impossible to load QtKeychain translation catalog" << qtkeychainTrFile;
Expand Down
Loading