From 97b11bf2da7af6f94b088e5a338ccc8920a88b73 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Wed, 10 Dec 2025 21:16:57 -0500 Subject: [PATCH] refactor: I18n, add static s_prefix -> "_" to use when loading --- src/lib/common/I18N.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/lib/common/I18N.cpp b/src/lib/common/I18N.cpp index f96c63d51..2c192aba2 100644 --- a/src/lib/common/I18N.cpp +++ b/src/lib/common/I18N.cpp @@ -80,9 +80,11 @@ I18N::I18N(QObject *parent) : QObject{parent} detectLanguages(); + static const auto s_prefix = QStringLiteral("_"); + if (Settings::value(Settings::Core::Language).isNull()) { auto appTranslator = new QTranslator(this); - if (appTranslator->load(QLocale(), kAppId, "_", m_appTrPath)) { + if (appTranslator->load(QLocale(), kAppId, s_prefix, m_appTrPath)) { m_currentTranslations.append(appTranslator); QCoreApplication::installTranslator(appTranslator); } @@ -92,7 +94,7 @@ I18N::I18N(QObject *parent) : QObject{parent} m_currentLang = QStringLiteral("English"); auto qtTranslator = new QTranslator(this); - if (qtTranslator->load(QLocale(), QStringLiteral("qt"), "_", m_qtTrPath)) { + if (qtTranslator->load(QLocale(), QStringLiteral("qt"), s_prefix, m_qtTrPath)) { m_currentTranslations.append(qtTranslator); QCoreApplication::installTranslator(qtTranslator); } @@ -204,7 +206,7 @@ void I18N::detectLanguages() QMap qtTranslations; for (const QString &translation : std::as_const(langList)) { - QString lang = translation.mid(qtTrNameLen, translation.lastIndexOf('.') - qtTrNameLen); + QString lang = translation.mid(qtTrNameLen, translation.lastIndexOf(QLatin1Char('.')) - qtTrNameLen); qtTranslations.insert(lang, QStringLiteral("%1/%2").arg(m_qtTrPath, translation)); }