Merge branch 'fix/#231' into develop

fougue · Oct 10, 2023 · c22977e · c22977e
2 parents fe207a3 + 4b85215
commit c22977e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/mayo.pro b/mayo.pro
@@ -119,6 +119,14 @@ OTHER_FILES += \
     images/credits.txt \
     scripts/bump-version.rb \
 
+# Embed qtbase_*.qm files as a resource
+qtBaseQmRes.files = \
+    $$[QT_INSTALL_TRANSLATIONS]/qtbase_en.qm \
+    $$[QT_INSTALL_TRANSLATIONS]/qtbase_fr.qm
+qtBaseQmRes.base = $$[QT_INSTALL_TRANSLATIONS]
+qtBaseQmRes.prefix = "/i18n"
+RESOURCES += qtBaseQmRes
+
 # Optional developer-specific QMake pri file for environment related settings
 exists($$PWD/env.pri) {
     include($$PWD/env.pri)

diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -460,12 +460,16 @@ static int runApp(QCoreApplication* qtApp)
     appModule->settings()->setStorage(std::make_unique<QSettingsStorage>());
     {
         // Load translation files
-        const QString qmFilePath = QString(":/i18n/mayo_%1.qm").arg(appModule->languageCode());
-        auto translator = new QTranslator(qtApp);
-        if (translator->load(qmFilePath))
-            qtApp->installTranslator(translator);
-        else
-            qWarning() << Main::tr("Failed to load translation file [path=%1]").arg(qmFilePath);
+        auto fnLoadQmFile = [=](const QString& qmFilePath) {
+            auto translator = new QTranslator(qtApp);
+            if (translator->load(qmFilePath))
+                qtApp->installTranslator(translator);
+            else
+                qWarning() << Main::tr("Failed to load translation file [path=%1]").arg(qmFilePath);
+        };
+        const QString appLangCode = appModule->languageCode();
+        fnLoadQmFile(QString(":/i18n/mayo_%1.qm").arg(appLangCode));
+        fnLoadQmFile(QString(":/i18n/qtbase_%1.qm").arg(appLangCode));
     }
 
     // Initialize Base application