chore: move loadtranslator to dtkgui

dependcy: linuxdeepin/dtkgui#183 load qt and app translation files in dtkgui dtkwidget only load dtkwidget_xx.qm
linuxdeepin · Jul 26, 2023 · bce1dd9 · bce1dd9
1 parent 28fe139
commit bce1dd9
Showing 1 changed file with 6 additions and 36 deletions.
diff --git a/src/widgets/dapplication.cpp b/src/widgets/dapplication.cpp
@@ -235,24 +235,6 @@ bool DApplicationPrivate::setSingleInstanceByDbus(const QString &key)
 
 bool DApplicationPrivate::loadDtkTranslator(QList<QLocale> localeFallback)
 {
-    D_Q(DApplication);
-
-    auto qtTranslator = new QTranslator(q);
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    qtTranslator->load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
-#else
-    qtTranslator->load("qt_" + QLocale::system().name(), QLibraryInfo::path(QLibraryInfo::TranslationsPath));
-#endif
-    q->installTranslator(qtTranslator);
-
-    auto qtbaseTranslator = new QTranslator(q);
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    qtTranslator->load("qtbase_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
-#else
-    qtTranslator->load("qtbase_" + QLocale::system().name(), QLibraryInfo::path(QLibraryInfo::TranslationsPath));
-#endif
-    q->installTranslator(qtbaseTranslator);
-
     QList<QString> translateDirs;
     auto dtkwidgetDir = DWIDGET_TRANSLATIONS_DIR;
     auto dtkwidgetName = "dtkwidget";
@@ -264,9 +246,8 @@ bool DApplicationPrivate::loadDtkTranslator(QList<QLocale> localeFallback)
         translateDirs << (DPathBuf / dtkwidgetDir).toString();
     }
 
-#ifdef DTK_STATIC_TRANSLATION
-    translateDirs << QString(":/dtk/translations");
-#endif
+    if (QFileInfo::exists(":/dtk/translations"))
+        translateDirs << QString(":/dtk/translations");
 
     return DGuiApplicationHelper::loadTranslator(dtkwidgetName, translateDirs, localeFallback);
 }
@@ -777,22 +758,11 @@ bool DApplication::loadTranslator(QList<QLocale> localeFallback)
 {
     D_D(DApplication);
 
-    d->loadDtkTranslator(localeFallback);
-
-    QList<QString> translateDirs;
-    auto appName = applicationName();
-    //("/home/user/.local/share", "/usr/local/share", "/usr/share")
-    auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
-    for (const auto &path : dataDirs) {
-        DPathBuf DPathBuf(path);
-        translateDirs << (DPathBuf / appName / "translations").toString();
-    }
-
-#ifdef DTK_STATIC_TRANSLATION
-    translateDirs << QString(":/dtk/translations");
-#endif
+    bool loadDtkTranslator =  d->loadDtkTranslator(localeFallback);
+    // qt && qtbase && appName
+    bool loadQtAppTranslator = DGuiApplicationHelper::loadTranslator(localeFallback);
 
-    return DGuiApplicationHelper::loadTranslator(appName, translateDirs, localeFallback);
+    return loadDtkTranslator && loadQtAppTranslator;
 }
 
 /*!