From 2368d03b58f545d821d5fafbea21754380793828 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Fri, 1 Apr 2022 23:39:10 +0200 Subject: [PATCH] Refactoring: move src/res/translation to src/translation This is done to find translation files quicker --- .github/workflows/translation-check.yml | 4 +- Jamulus.pro | 46 +++++++++--------- distributions/debian/rules | 2 +- docs/TRANSLATING.md | 4 +- .../translation/wininstaller/installerlng.nsi | 36 -------------- src/resources.qrc | 22 ++++----- .../translation/translation_de_DE.qm | Bin 121093 -> 121103 bytes .../translation/translation_de_DE.ts | 0 .../translation/translation_es_ES.qm | Bin 120946 -> 120956 bytes .../translation/translation_es_ES.ts | 0 .../translation/translation_fr_FR.qm | Bin 128796 -> 128806 bytes .../translation/translation_fr_FR.ts | 0 .../translation/translation_it_IT.qm | Bin 122618 -> 122628 bytes .../translation/translation_it_IT.ts | 0 .../translation/translation_nl_NL.qm | Bin 119988 -> 119998 bytes .../translation/translation_nl_NL.ts | 0 .../translation/translation_pl_PL.qm | Bin 117930 -> 117940 bytes .../translation/translation_pl_PL.ts | 0 .../translation/translation_pt_BR.qm | Bin 121860 -> 121870 bytes .../translation/translation_pt_BR.ts | 0 .../translation/translation_pt_PT.qm | Bin 122352 -> 122362 bytes .../translation/translation_pt_PT.ts | 0 .../translation/translation_sk_SK.qm | Bin 74492 -> 74502 bytes .../translation/translation_sk_SK.ts | 0 .../translation/translation_sv_SE.qm | Bin 115844 -> 115854 bytes .../translation/translation_sv_SE.ts | 0 .../translation/translation_zh_CN.qm | Bin 75541 -> 75551 bytes .../translation/translation_zh_CN.ts | 0 src/{res => }/translation/wininstaller/de.nsi | 0 src/{res => }/translation/wininstaller/en.nsi | 0 src/{res => }/translation/wininstaller/es.nsi | 0 src/{res => }/translation/wininstaller/fr.nsi | 0 src/translation/wininstaller/installerlng.nsi | 36 ++++++++++++++ src/{res => }/translation/wininstaller/it.nsi | 0 src/{res => }/translation/wininstaller/nl.nsi | 0 src/{res => }/translation/wininstaller/pl.nsi | 0 src/{res => }/translation/wininstaller/pt.nsi | 0 .../translation/wininstaller/pt_br.nsi | 0 src/{res => }/translation/wininstaller/se.nsi | 0 .../translation/wininstaller/zh_cn.nsi | 0 tools/check-wininstaller-translations.sh | 4 +- tools/create-translation-issues.sh | 2 +- tools/get_release_contributors.py | 4 +- tools/update-copyright-notices.sh | 2 +- windows/installer.nsi | 2 +- 45 files changed, 82 insertions(+), 82 deletions(-) delete mode 100644 src/res/translation/wininstaller/installerlng.nsi rename src/{res => }/translation/translation_de_DE.qm (99%) rename src/{res => }/translation/translation_de_DE.ts (100%) rename src/{res => }/translation/translation_es_ES.qm (99%) rename src/{res => }/translation/translation_es_ES.ts (100%) rename src/{res => }/translation/translation_fr_FR.qm (99%) rename src/{res => }/translation/translation_fr_FR.ts (100%) rename src/{res => }/translation/translation_it_IT.qm (99%) rename src/{res => }/translation/translation_it_IT.ts (100%) rename src/{res => }/translation/translation_nl_NL.qm (99%) rename src/{res => }/translation/translation_nl_NL.ts (100%) rename src/{res => }/translation/translation_pl_PL.qm (99%) rename src/{res => }/translation/translation_pl_PL.ts (100%) rename src/{res => }/translation/translation_pt_BR.qm (99%) rename src/{res => }/translation/translation_pt_BR.ts (100%) rename src/{res => }/translation/translation_pt_PT.qm (99%) rename src/{res => }/translation/translation_pt_PT.ts (100%) rename src/{res => }/translation/translation_sk_SK.qm (99%) rename src/{res => }/translation/translation_sk_SK.ts (100%) rename src/{res => }/translation/translation_sv_SE.qm (99%) rename src/{res => }/translation/translation_sv_SE.ts (100%) rename src/{res => }/translation/translation_zh_CN.qm (99%) rename src/{res => }/translation/translation_zh_CN.ts (100%) rename src/{res => }/translation/wininstaller/de.nsi (100%) rename src/{res => }/translation/wininstaller/en.nsi (100%) rename src/{res => }/translation/wininstaller/es.nsi (100%) rename src/{res => }/translation/wininstaller/fr.nsi (100%) create mode 100644 src/translation/wininstaller/installerlng.nsi rename src/{res => }/translation/wininstaller/it.nsi (100%) rename src/{res => }/translation/wininstaller/nl.nsi (100%) rename src/{res => }/translation/wininstaller/pl.nsi (100%) rename src/{res => }/translation/wininstaller/pt.nsi (100%) rename src/{res => }/translation/wininstaller/pt_br.nsi (100%) rename src/{res => }/translation/wininstaller/se.nsi (100%) rename src/{res => }/translation/wininstaller/zh_cn.nsi (100%) diff --git a/.github/workflows/translation-check.yml b/.github/workflows/translation-check.yml index 802ece7148..44ffe45d05 100644 --- a/.github/workflows/translation-check.yml +++ b/.github/workflows/translation-check.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: push: paths: - - 'src/res/translation/**' + - 'src/translation/**' jobs: translation-check: @@ -18,4 +18,4 @@ jobs: - name: "Check Windows installer translations" run: ./tools/check-wininstaller-translations.sh #- name: "Check for duplicate hotkeys (will not fail)" - # run: sudo apt install libxml-simple-perl && cd src/res/translation/ && perl ./tools/checkkeys.pl + # run: sudo apt install libxml-simple-perl && cd src/translation/ && perl ./tools/checkkeys.pl diff --git a/Jamulus.pro b/Jamulus.pro index a6d8dbc05c..65a2f3da93 100644 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -41,18 +41,18 @@ contains(CONFIG, "headless") { QT += widgets } -LRELEASE_DIR = src/res/translation -TRANSLATIONS = src/res/translation/translation_de_DE.ts \ - src/res/translation/translation_fr_FR.ts \ - src/res/translation/translation_pt_PT.ts \ - src/res/translation/translation_pt_BR.ts \ - src/res/translation/translation_es_ES.ts \ - src/res/translation/translation_nl_NL.ts \ - src/res/translation/translation_pl_PL.ts \ - src/res/translation/translation_sk_SK.ts \ - src/res/translation/translation_it_IT.ts \ - src/res/translation/translation_sv_SE.ts \ - src/res/translation/translation_zh_CN.ts +LRELEASE_DIR = src/translation +TRANSLATIONS = src/translation/translation_de_DE.ts \ + src/translation/translation_fr_FR.ts \ + src/translation/translation_pt_PT.ts \ + src/translation/translation_pt_BR.ts \ + src/translation/translation_es_ES.ts \ + src/translation/translation_nl_NL.ts \ + src/translation/translation_pl_PL.ts \ + src/translation/translation_sk_SK.ts \ + src/translation/translation_it_IT.ts \ + src/translation/translation_sv_SE.ts \ + src/translation/translation_zh_CN.ts INCLUDEPATH += src @@ -683,17 +683,17 @@ DISTFILES += ChangeLog \ distributions/jamulus.png \ distributions/jamulus.svg \ distributions/jamulus-server.svg \ - src/res/translation/translation_de_DE.qm \ - src/res/translation/translation_fr_FR.qm \ - src/res/translation/translation_pt_PT.qm \ - src/res/translation/translation_pt_BR.qm \ - src/res/translation/translation_es_ES.qm \ - src/res/translation/translation_nl_NL.qm \ - src/res/translation/translation_pl_PL.qm \ - src/res/translation/translation_it_IT.qm \ - src/res/translation/translation_sv_SE.qm \ - src/res/translation/translation_sk_SK.qm \ - src/res/translation/translation_zh_CN.qm \ + src/translation/translation_de_DE.qm \ + src/translation/translation_fr_FR.qm \ + src/translation/translation_pt_PT.qm \ + src/translation/translation_pt_BR.qm \ + src/translation/translation_es_ES.qm \ + src/translation/translation_nl_NL.qm \ + src/translation/translation_pl_PL.qm \ + src/translation/translation_it_IT.qm \ + src/translation/translation_sv_SE.qm \ + src/translation/translation_sk_SK.qm \ + src/translation/translation_zh_CN.qm \ src/res/CLEDBlack.png \ src/res/CLEDBlackSmall.png \ src/res/CLEDDisabledSmall.png \ diff --git a/distributions/debian/rules b/distributions/debian/rules index b02fc89b4d..bf8fc2be5c 100755 --- a/distributions/debian/rules +++ b/distributions/debian/rules @@ -19,7 +19,7 @@ override_dh_auto_configure: mkdir -p build-nox && cd build-nox && $(QMAKE) "CONFIG+=headless serveronly" TARGET=jamulus-headless PREFIX=/usr ../Jamulus.pro override_dh_auto_build: - cd src/res/translation && lrelease *.ts + cd src/translation && lrelease *.ts cd build-gui && make -j "$$(nproc)" cd build-nox && make -j "$$(nproc)" diff --git a/docs/TRANSLATING.md b/docs/TRANSLATING.md index 407d56b066..161af7c536 100644 --- a/docs/TRANSLATING.md +++ b/docs/TRANSLATING.md @@ -175,7 +175,7 @@ Do not click on **Publish branch** just yet. ### Work on the translation file -Open Qt Linguist, and navigate to the directory `src/res/translation` within your project directory. +Open Qt Linguist, and navigate to the directory `src/translation` within your project directory. In this directory are translation source files for each language, each with a `.ts` suffix. Don't worry about the `.qm` files, as they are compiled when building the release code. @@ -220,7 +220,7 @@ Finally, go to the Github website where it will most likely offer a banner sayin Select the current repository as `jamulus`, and the branch that was created above, such as `translate-r3_7_0-german`. -The changed file(s) should be listed in the left-hand column as `src/res/translation/translation_xx_YY.ts`. When the file is selected, the differences will be displayed in the main panel. +The changed file(s) should be listed in the left-hand column as `src/translation/translation_xx_YY.ts`. When the file is selected, the differences will be displayed in the main panel. Add a simple commit message in the first box below the file list, (e.g. change "Update filename" to something like "Update German translations for v3.7.0"), and add any extra description in the Description box (optional, probably not required). diff --git a/src/res/translation/wininstaller/installerlng.nsi b/src/res/translation/wininstaller/installerlng.nsi deleted file mode 100644 index 7b6138c364..0000000000 --- a/src/res/translation/wininstaller/installerlng.nsi +++ /dev/null @@ -1,36 +0,0 @@ -; Language configuration - -; Additional languages can be added in this file. See https://nsis.sourceforge.io/Examples/Modern%20UI/MultiLanguage.nsi - -!insertmacro MUI_LANGUAGE "English" ; The first language is the default -!include "${ROOT_PATH}\src\res\translation\wininstaller\en.nsi" ; include english - -!insertmacro MUI_LANGUAGE "German" -!include "${ROOT_PATH}\src\res\translation\wininstaller\de.nsi" - -!insertmacro MUI_LANGUAGE "Italian" -!include "${ROOT_PATH}\src\res\translation\wininstaller\it.nsi" ; include italian - -!insertmacro MUI_LANGUAGE "Dutch" -!include "${ROOT_PATH}\src\res\translation\wininstaller\nl.nsi" - -!insertmacro MUI_LANGUAGE "Polish" -!include "${ROOT_PATH}\src\res\translation\wininstaller\pl.nsi" - -!insertmacro MUI_LANGUAGE "French" -!include "${ROOT_PATH}\src\res\translation\wininstaller\fr.nsi" - -!insertmacro MUI_LANGUAGE "Spanish" -!include "${ROOT_PATH}\src\res\translation\wininstaller\es.nsi" - -!insertmacro MUI_LANGUAGE "Swedish" -!include "${ROOT_PATH}\src\res\translation\wininstaller\se.nsi" - -!insertmacro MUI_LANGUAGE "PortugueseBR" -!include "${ROOT_PATH}\src\res\translation\wininstaller\pt_br.nsi" - -!insertmacro MUI_LANGUAGE "Portuguese" -!include "${ROOT_PATH}\src\res\translation\wininstaller\pt.nsi" - -!insertmacro MUI_LANGUAGE "SimpChinese" -!include "${ROOT_PATH}\src\res\translation\wininstaller\zh_cn.nsi" diff --git a/src/resources.qrc b/src/resources.qrc index aead3fc138..8d4fd7d3bf 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -1,36 +1,36 @@ - res/translation/translation_de_DE.qm + translation/translation_de_DE.qm - res/translation/translation_fr_FR.qm + translation/translation_fr_FR.qm - res/translation/translation_pt_PT.qm + translation/translation_pt_PT.qm - res/translation/translation_pt_BR.qm + translation/translation_pt_BR.qm - res/translation/translation_es_ES.qm + translation/translation_es_ES.qm - res/translation/translation_nl_NL.qm + translation/translation_nl_NL.qm - res/translation/translation_it_IT.qm + translation/translation_it_IT.qm - res/translation/translation_pl_PL.qm + translation/translation_pl_PL.qm - res/translation/translation_sk_SK.qm + translation/translation_sk_SK.qm - res/translation/translation_sv_SE.qm + translation/translation_sv_SE.qm - res/translation/translation_zh_CN.qm + translation/translation_zh_CN.qm diff --git a/src/res/translation/translation_de_DE.qm b/src/translation/translation_de_DE.qm similarity index 99% rename from src/res/translation/translation_de_DE.qm rename to src/translation/translation_de_DE.qm index f314fa857b6cdbc509b46512a96af27b41b8ad14..640ad998d311679486715fe0bdfdb4d434cae303 100644 GIT binary patch delta 40 ycmV+@0N4M8vImc{2O2!MWEjftoR!TX9KT?pz1^n(000GKWnV-^fe^J20rl8qtq|Y< delta 30 ocmV+(0O9|SvIm8-2M|2CWEjftoR!TX9KT?pz1@KtwHg8S*wxt%jQ{`u diff --git a/src/res/translation/translation_de_DE.ts b/src/translation/translation_de_DE.ts similarity index 100% rename from src/res/translation/translation_de_DE.ts rename to src/translation/translation_de_DE.ts diff --git a/src/res/translation/translation_es_ES.qm b/src/translation/translation_es_ES.qm similarity index 99% rename from src/res/translation/translation_es_ES.qm rename to src/translation/translation_es_ES.qm index 6a2c7c552220fab42fe8abbda4fc6f1fdfa48bcb..21d32178c086a03d7a123b400cfa50405d726dc1 100644 GIT binary patch delta 40 ycmV+@0N4NWum}9G2O2!MWEjftoR!TX9KT?pz1^n(000GLb6-VMfe^J20b<{9 diff --git a/src/res/translation/translation_it_IT.ts b/src/translation/translation_it_IT.ts similarity index 100% rename from src/res/translation/translation_it_IT.ts rename to src/translation/translation_it_IT.ts diff --git a/src/res/translation/translation_nl_NL.qm b/src/translation/translation_nl_NL.qm similarity index 99% rename from src/res/translation/translation_nl_NL.qm rename to src/translation/translation_nl_NL.qm index bc9c1470423a7696e8900f479e939e18698f1a4f..66e1826284a461681405127bd563d98d664a9583 100644 GIT binary patch delta 40 ycmV+@0N4MtsRzEP2O2!MWEjftoR!TX9KT?pz1^n(000GUY+p`Hfe^J20i@J$-Vpf! delta 30 ocmV+(0O9|>sRy*F2M|2CWEjftoR!TX9KT?pz1@KtwHg7W)ZM!dga7~l diff --git a/src/res/translation/translation_nl_NL.ts b/src/translation/translation_nl_NL.ts similarity index 100% rename from src/res/translation/translation_nl_NL.ts rename to src/translation/translation_nl_NL.ts diff --git a/src/res/translation/translation_pl_PL.qm b/src/translation/translation_pl_PL.qm similarity index 99% rename from src/res/translation/translation_pl_PL.qm rename to src/translation/translation_pl_PL.qm index 5ab7334c8dcf5e31b05aca70b1f9a763d68b6215..8fa31f508a834f10305c346405bfa12d59748ddb 100644 GIT binary patch delta 40 ycmV+@0N4MjnFq9)2O2!MWEjftoR!TX9KT?pz1^n(000GWY+q1Jfe^J20h-KdIuN%2 delta 30 ocmV+(0O9|%nFp$w2M|2CWEjftoR!TX9KT?pz1@KtwHg7M%-8h}J^%m! diff --git a/src/res/translation/translation_pl_PL.ts b/src/translation/translation_pl_PL.ts similarity index 100% rename from src/res/translation/translation_pl_PL.ts rename to src/translation/translation_pl_PL.ts diff --git a/src/res/translation/translation_pt_BR.qm b/src/translation/translation_pt_BR.qm similarity index 99% rename from src/res/translation/translation_pt_BR.qm rename to src/translation/translation_pt_BR.qm index a3b2fedf264d3f634f1dcb7207de9cce99539d13..e493272883c04d80606fb8fa8786ac45ad5ec4df 100644 GIT binary patch delta 40 ycmV+@0N4M7xCf572O2!MWEjftoR!TX9KT?pz1^n(000GWbYDVJfe^J20rcBvt`QOd delta 30 ocmV+(0O9|RxCex|2M|2CWEjftoR!TX9KT?pz1@KtwHg8R+t%w2nE(I) diff --git a/src/res/translation/translation_pt_BR.ts b/src/translation/translation_pt_BR.ts similarity index 100% rename from src/res/translation/translation_pt_BR.ts rename to src/translation/translation_pt_BR.ts diff --git a/src/res/translation/translation_pt_PT.qm b/src/translation/translation_pt_PT.qm similarity index 99% rename from src/res/translation/translation_pt_PT.qm rename to src/translation/translation_pt_PT.qm index ca13552e99017c192670e4d8fea67852f80acd8f..8ed2aead0913fe003ae84813e6e4d8aa9e2a5303 100644 GIT binary patch delta 40 ycmV+@0N4NUy9fHa2O2!MWEjftoR!TX9KT?pz1^n(000GWbYDt<8 diff --git a/src/res/translation/translation_sk_SK.ts b/src/translation/translation_sk_SK.ts similarity index 100% rename from src/res/translation/translation_sk_SK.ts rename to src/translation/translation_sk_SK.ts diff --git a/src/res/translation/translation_sv_SE.qm b/src/translation/translation_sv_SE.qm similarity index 99% rename from src/res/translation/translation_sv_SE.qm rename to src/translation/translation_sv_SE.qm index 5023e573edfe3acd52fdc7082496ba01edebb1da..0f8124f904d1d7b04358a26b78989a37c1b3ec1d 100644 GIT binary patch delta 40 wcmZqaWbf-_m$KQBB5~^doT+COW%eg5+/dev/stderr exit 1 fi - for LANG_FILE in src/res/translation/*.ts; do + for LANG_FILE in src/translation/*.ts; do LANG=${LANG_FILE/*\/translation_} LANG=${LANG/.ts} echo "$LANG" diff --git a/tools/get_release_contributors.py b/tools/get_release_contributors.py index 9f8b261490..5a85e9dde1 100755 --- a/tools/get_release_contributors.py +++ b/tools/get_release_contributors.py @@ -137,11 +137,11 @@ def main(from_, to): def print_code_contributors(from_, to): - return print_contributors('Code contributors', ['.', ':!src/res/translation'], from_, to) + return print_contributors('Code contributors', ['.', ':!src/translation'], from_, to) def print_app_translators(from_, to): - return print_contributors('Application translators', ['src/res/translation'], from_, to) + return print_contributors('Application translators', ['src/translation'], from_, to) def print_website_contributors(from_, to): diff --git a/tools/update-copyright-notices.sh b/tools/update-copyright-notices.sh index 35045ce7ed..7eb3cbdd4f 100755 --- a/tools/update-copyright-notices.sh +++ b/tools/update-copyright-notices.sh @@ -3,7 +3,7 @@ set -eu YEAR=$(date +%Y) echo "Updating global copyright strings..." -sed -re 's/(Copyright.*2[0-9]{3}-)[0-9]{4}/\1'"${YEAR}"'/g' -i src/res/translation/*.ts src/util.cpp src/aboutdlgbase.ui +sed -re 's/(Copyright.*2[0-9]{3}-)[0-9]{4}/\1'"${YEAR}"'/g' -i src/translation/*.ts src/util.cpp src/aboutdlgbase.ui echo "Updating copyright comment headers..." find android ios linux mac src windows -regex '.*\.\(cpp\|h\|mm\)' -not -regex '\./\(\.git\|libs/\|moc_\|ui_\).*' | while read -r file; do diff --git a/windows/installer.nsi b/windows/installer.nsi index 0f4103ca1e..fde21f45a7 100644 --- a/windows/installer.nsi +++ b/windows/installer.nsi @@ -96,7 +96,7 @@ BrandingText "${APP_NAME}. Make music online. With friends. For free." ; Supported languages configuration ; Additional languages can be added in the file installerlng.nsi in the wininstaller folder, see https://nsis.sourceforge.io/Examples/Modern%20UI/MultiLanguage.nsi -!include "${ROOT_PATH}\src\res\translation\wininstaller\installerlng.nsi" +!include "${ROOT_PATH}\src\translation\wininstaller\installerlng.nsi" ; Abort the installer/uninstaller if Jamulus is running