Skip to content

fix: translation not loaded if language code not fully matched #351

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
Jun 3, 2025
Merged

fix: translation not loaded if language code not fully matched #351

Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions dock-hotspot-plugin/hotspotplugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ HotspotPlugin::HotspotPlugin(QObject *parent)
: QObject(parent)
{
QTranslator *trs = new QTranslator(this);
trs->load(QString("/usr/share/dock-hotspot-plugin/translations/dock-hotspot-plugin_%1.qm").arg(QLocale::system().name()));
QCoreApplication::installTranslator(trs);
if (trs->load(QLocale(), "dock-hotspot-plugin", "_", "/usr/share/dock-hotspot-plugin/translations")) {
QCoreApplication::installTranslator(trs);
}
}

void HotspotPlugin::init(PluginProxyInterface *proxyInter) {
Expand Down
2 changes: 1 addition & 1 deletion dock-network-plugin/networkplugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ NetworkPlugin::NetworkPlugin(QObject *parent)
, m_netLimited(false)
{
QTranslator *translator = new QTranslator(this);
if (translator->load(QString("/usr/share/dock-network-plugin/translations/dock-network-plugin_%1").arg(QLocale().name()))) {
if (translator->load(QLocale(), "dock-network-plugin", "_", "/usr/share/dock-network-plugin/translations")) {
QCoreApplication::installTranslator(translator);
}
}
Expand Down
2 changes: 1 addition & 1 deletion dss-network-plugin/networkmodule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ void NetworkModule::installTranslator(const QString &locale)
}
localTmp = locale;
QApplication::removeTranslator(&translator);
translator.load(QString("/usr/share/dss-network-plugin/translations/dss-network-plugin_%1").arg(locale));
translator.load(QLocale(locale), "dss-network-plugin", "_", "/usr/share/dss-network-plugin/translations");
QApplication::installTranslator(&translator);
m_manager->updateLanguage(localTmp);
}
Expand Down
10 changes: 6 additions & 4 deletions network-service-plugin/system/networkinitialization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,10 +377,12 @@ bool NetworkInitialization::installUserTranslator(const QString &json)
localTmp = locale;
static QTranslator translator;
QCoreApplication::removeTranslator(&translator);
const QString qmFile = QString("%1/network-service-plugin_%2.qm").arg(QM_FILES_DIR).arg(locale);
translator.load(qmFile);
QCoreApplication::installTranslator(&translator);
qCDebug(DSM) << "install translation file" << qmFile;
if (translator.load(QLocale(locale), "network-service-plugin", "_", QM_FILES_DIR)) {
QCoreApplication::installTranslator(&translator);
qCInfo(DSM) << "Loaded translation file for network-service-plugin:" << translator.filePath();
} else {
qCWarning(DSM) << "Failed to load translation file for network-service-plugin with locale:" << locale;
}
}

return true;
Expand Down
10 changes: 8 additions & 2 deletions src/networkcontroller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,14 @@ void NetworkController::installTranslator(const QString &locale)
} else {
m_translator = new QTranslator;
}
m_translator->load(QString("/usr/share/dde-network-core/translations/dde-network-core_%1").arg(localeName));
QCoreApplication::installTranslator(m_translator);
if (m_translator->load(QLocale(localeName), "dde-network-core", "_", "/usr/share/dde-network-core/translations")) {
QCoreApplication::installTranslator(m_translator);
qInfo() << "Loaded translation file for dde-network-core:" << m_translator->filePath();
} else {
qWarning() << "Failed to load translation file for dde-network-core";
m_translator->deleteLater();
m_translator = nullptr;
}
}

void NetworkController::updateSync(const bool sync)
Expand Down