Skip to content

fix: translation won't load if locale code isn't 100% matched #1137

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

Merged
BLumia merged 1 commit into from
May 30, 2025
Merged

fix: translation won't load if locale code isn't 100% matched #1137

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
21 changes: 10 additions & 11 deletions shell/appletloader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,17 +248,16 @@ void DAppletLoaderPrivate::loadTranslation(const DPluginMetaData &pluginData)
const QString baseDir = pluginData.pluginDir();
const QString pluginId = pluginData.pluginId();

QString pluginTransFilePath = QString(baseDir + "/translations/" + pluginId + "_%1.qm").arg(QLocale::system().name());
if (QFile::exists(pluginTransFilePath)) {
auto translator = new QTranslator(qApp);
if (translator->load(pluginTransFilePath)) {
m_pluginTranslators[pluginId] = translator;
qApp->installTranslator(translator);
qInfo(dsLoaderLog) << "Loaded translation:" << pluginTransFilePath;
} else {
qCWarning(dsLoaderLog) << "Failed to load translation:" << pluginTransFilePath;
translator->deleteLater();
}
auto translator = new QTranslator(qApp);
const QString pluginTranslationDir(baseDir + "/translations/");
if (translator->load(QLocale::system(), pluginId, QLatin1String("_"), pluginTranslationDir)) {
m_pluginTranslators[pluginId] = translator;
qApp->installTranslator(translator);
qInfo(dsLoaderLog) << "Loaded translation:" << translator->filePath();
} else {
qCWarning(dsLoaderLog) << "Failed to load translation:" << pluginTranslationDir << "plugin id:" << pluginId
<< "locale:" << QLocale::system().uiLanguages();
translator->deleteLater();
}

const auto children = DPluginLoader::instance()->childrenPlugin(pluginId);
Expand Down