Add translations for Qt modules to installer (#1887)

* Add translations to installer for Qt modules * Add French translations for Qt modules to installer * Change the path to search for translations from /translations to /resources/translations
trikset · Jan 10, 2025 · b86d55e · b86d55e
1 parent 4843a86
commit b86d55e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/windows_build_with_installer.yml b/.github/workflows/windows_build_with_installer.yml
@@ -96,7 +96,7 @@ jobs:
           version: '${{matrix.qt-version}}'
           arch: win${{ matrix.mingw-bitness }}_mingw${{matrix.mingw-short-version}}
           modules: 'qtscript'
-          archives: 'qtbase qtmultimedia qtsvg qtscript qttools qtserialport qtimageformats qtwinextras'
+          archives: 'qtbase qtmultimedia qtsvg qtscript qttools qtserialport qtimageformats qtwinextras qttranslations'
           tools: 'tools_mingw,qt.tools.win${{ matrix.mingw-bitness }}_mingw${{matrix.mingw-short-version}}0 tools_ifw'
           add-tools-to-path: true
           cache: true

diff --git a/buildScripts/github/install.sh b/buildScripts/github/install.sh
@@ -67,7 +67,7 @@ case "$(uname)" in
         sudo yum install -y --setopt=install_weak_deps=False libX11-xcb libXext libxkbcommon-x11 fontconfig freetype libXrender
         #libQt5WaylandCompositor.so.5.15: libQt5Quick.so.5 libQt5Qml.so.5 libQt5QmlModels.so.5 
         modules=("qtscript" "qtwaylandcompositor")
-        archives=("qtbase" "qtmultimedia" "qtsvg" "qtscript" "qttools" "qtserialport" "qtimageformats" "icu" "qtwayland" "qtdeclarative")
+        archives=("qtbase" "qtmultimedia" "qtsvg" "qtscript" "qttools" "qtserialport" "qtimageformats" "icu" "qtwayland" "qtdeclarative" "qttranslations")
         install_qt linux desktop "$TRIK_QT_VERSION" "$HOME/Qt" $modules $archives
         QT_ROOT_DIR=$(ls -1d "$HOME"/Qt/$TRIK_QT_VERSION*/gcc_64 | head -n 1)
         echo "$QT_ROOT_DIR/bin" >> $GITHUB_PATH

diff --git a/installer/build-installer.sh b/installer/build-installer.sh
@@ -23,6 +23,7 @@ esac
 export QT_LIB=$(cygpath -u $("$QT_DIR"/qmake -query "$qt_query_key"))
 
 export QT_PLUGINS=$(cygpath -u $("$QT_DIR"/qmake -query QT_INSTALL_PLUGINS))
+export QT_TRANSLATIONS=$(cygpath -u $("$QT_DIR"/qmake -query QT_INSTALL_TRANSLATIONS))
 export QTIFW_DIR=$(realpath $(cygpath -u "$2"))
 export PRODUCT="$3"
 export OS="$OSTYPE"

diff --git a/installer/packages/qreal-base/ru.qreal.root.languages.french/meta/prebuild-common.sh b/installer/packages/qreal-base/ru.qreal.root.languages.french/meta/prebuild-common.sh
@@ -6,3 +6,5 @@ cd "$(dirname "$0")"
 
 mkdir -p "$PWD"/../data/translations
 rsync -a "$BIN_DIR"/translations/fr "$PWD"/../data/translations
+ls "$QT_TRANSLATIONS"
+rsync -a "$QT_TRANSLATIONS"/*fr.qm "$PWD"/../data/translations
diff --git a/installer/packages/qreal-base/ru.qreal.root.languages.russian/meta/prebuild-common.sh b/installer/packages/qreal-base/ru.qreal.root.languages.russian/meta/prebuild-common.sh
@@ -6,3 +6,5 @@ cd "$(dirname "$0")"
 
 mkdir -p "$PWD"/../data/translations
 rsync -a "$BIN_DIR"/translations/ru "$PWD"/../data/translations
+ls "$QT_TRANSLATIONS"
+rsync -a "$QT_TRANSLATIONS"/*ru.qm "$PWD"/../data/translations
diff --git a/qrgui/mainWindow/main.cpp b/qrgui/mainWindow/main.cpp
@@ -43,7 +43,7 @@ static void loadTranslators(QLocale &locale)
 {
 	/// Load Qt's system translations before application translations
 	static const QStringList qtModules {"qtbase", "qtmultimedia", "qtserialport", "qtxmlpatterns", "qtscript" };
-	static const auto qtAppsTranslationsDir = QLibraryInfo::location(QLibraryInfo::LibraryLocation::TranslationsPath);
+	static const auto qtAppsTranslationsDir = PlatformInfo::invariantSettingsPath("pathToTranslations");
 
 	for (auto &&module: qtModules) {
 		auto *t = new QTranslator(qApp);