fix load qt's language file

ChiaYen-Kan · Aug 12, 2024 · 744df2d · 744df2d
1 parent 14a86d9
commit 744df2d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/.github/workflows/cmake-build.yml b/.github/workflows/cmake-build.yml
@@ -49,10 +49,7 @@ jobs:
           cp -rf build/lang/ ./dist/
       - name: Deploy - Qt
         run: |
-          windeployqt --no-opengl-sw --no-angle --no-system-d3d-compiler --no-translations --force ./dist/QuiteRSS.exe
-      - name: Deploy - Qt language file
-        run: |
-          cp $MSYSTEM_PREFIX/share/qt5/translations/qtbase_* ./dist/lang
+          windeployqt --no-opengl-sw --no-angle --no-system-d3d-compiler --force ./dist/QuiteRSS.exe
       - name: Deploy - mingw
         run: |
           cp $MSYSTEM_PREFIX/bin/libcrypto-*.dll ./dist/

diff --git a/.github/workflows/qmake-build.yml b/.github/workflows/qmake-build.yml
@@ -42,10 +42,7 @@ jobs:
         run: make release -j$(grep -c ^processor /proc/cpuinfo)
       - name: Deploy - Qt
         run: |
-          windeployqt --no-opengl-sw --no-angle --no-system-d3d-compiler --no-translations --force ./release/target/QuiteRSS.exe
-      - name: Deploy - Qt language file
-        run: |
-          cp $MSYSTEM_PREFIX/share/qt5/translations/qtbase_* ./release/target/lang
+          windeployqt --no-opengl-sw --no-angle --no-system-d3d-compiler --force ./release/target/QuiteRSS.exe
       - name: Deploy - mingw
         run: |
           cp $MSYSTEM_PREFIX/bin/libcrypto-*.dll ./release/target/

diff --git a/src/application/mainapplication.cpp b/src/application/mainapplication.cpp
@@ -382,8 +382,10 @@ void MainApplication::setTranslateApplication()
   if (!qt_translator_)
     qt_translator_ = new QTranslator(this);
   removeTranslator(qt_translator_);
-#ifdef HAVE_X11
+#if defined(HAVE_X11)
   qt_translator_->load(QLibraryInfo::location (QLibraryInfo::TranslationsPath) + "/qtbase_" + langFileName_);
+#elif defined(Q_OS_WIN)
+  qt_translator_->load(resourcesDir() + "/translations/qt_" + langFileName_);
 #else
   qt_translator_->load(resourcesDir() + "/lang/qtbase_" + langFileName_);
 #endif