Refactor load/install translators

kiwix · Mar 9, 2024 · dd4ddcf · dd4ddcf
1 parent bde4be3
commit dd4ddcf
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/src/kiwixapp.cpp b/src/kiwixapp.cpp
@@ -41,28 +41,20 @@ KiwixApp::KiwixApp(int& argc, char *argv[])
         return;
     }
 
-    bool loaded = false;
-    bool installed = false;
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    loaded = m_qtTranslator.load(QLocale(), "qt", "_",
-                        QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+    QString path = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
 #else
-    loaded = m_qtTranslator.load(QLocale(), "qt", "_",
-                        QLibraryInfo::path(QLibraryInfo::TranslationsPath));
+    QString path = QLibraryInfo::path(QLibraryInfo::TranslationsPath);
 #endif
-    if (loaded) {
-        installed = installTranslator(&m_qtTranslator);
-        if (!installed) {
-            // ignore for now
-        }
+    bool success = false;
+    success = loadAndInstallTranslations(m_qtTranslator, "qt", path);
+    if (!success) {
+        // ignore for now
     }
 
-    loaded = m_appTranslator.load(QLocale(), "kiwix-desktop", "_", ":/i18n/");
-    if (loaded) {
-        installed = installTranslator(&m_appTranslator);
-        if (!installed) {
-            // ignore for now
-        }
+    success = loadAndInstallTranslations(m_appTranslator, "kiwix-desktop", ":/i18n/");
+    if (!success) {
+        // ignore for now
     }
 
     QFontDatabase::addApplicationFont(":/fonts/Selawik/selawkb.ttf");
@@ -73,6 +65,16 @@ KiwixApp::KiwixApp(int& argc, char *argv[])
     setFont(QFont("Selawik"));
 }
 
+bool KiwixApp::loadAndInstallTranslations(QTranslator& translator, const QString& filename, const QString& directory) {
+    bool loaded = false;
+
+    loaded = translator.load(QLocale(), filename, "_", directory);
+    if (loaded) {
+        return installTranslator(&translator);
+    }
+    return false;
+}
+
 void KiwixApp::init()
 {
     try {

diff --git a/src/kiwixapp.h b/src/kiwixapp.h
@@ -119,6 +119,7 @@ public slots:
     QAction*     mpa_actions[MAX_ACTION];
 
     QString findLibraryDirectory();
+    bool loadAndInstallTranslations(QTranslator& translator, const QString& filename, const QString& directory);
 };
 
 QString gt(const QString &key);