Refactoring: move src/res/translation to src/translation

.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

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 \

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)"
 

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).

src/resources.qrc

@@ -1,36 +1,36 @@
 <RCC>
     <qresource prefix="/translations">
-        <file alias="translation_de">res/translation/translation_de_DE.qm</file>
+        <file alias="translation_de">translation/translation_de_DE.qm</file>
     </qresource>
     <qresource prefix="/translations">
-        <file alias="translation_fr">res/translation/translation_fr_FR.qm</file>
+        <file alias="translation_fr">translation/translation_fr_FR.qm</file>
     </qresource>
     <qresource prefix="/translations">
-        <file alias="translation_pt_PT">res/translation/translation_pt_PT.qm</file>
+        <file alias="translation_pt_PT">translation/translation_pt_PT.qm</file>
     </qresource>
     <qresource prefix="/translations">
-        <file alias="translation_pt">res/translation/translation_pt_BR.qm</file>
+        <file alias="translation_pt">translation/translation_pt_BR.qm</file>
     </qresource>
     <qresource prefix="/translations">
-        <file alias="translation_es">res/translation/translation_es_ES.qm</file>
+        <file alias="translation_es">translation/translation_es_ES.qm</file>
     </qresource>
     <qresource prefix="/translations">
-        <file alias="translation_nl">res/translation/translation_nl_NL.qm</file>
+        <file alias="translation_nl">translation/translation_nl_NL.qm</file>
     </qresource>
     <qresource prefix="/translations">
-        <file alias="translation_it">res/translation/translation_it_IT.qm</file>
+        <file alias="translation_it">translation/translation_it_IT.qm</file>
     </qresource>
     <qresource prefix="/translations">
-        <file alias="translation_pl">res/translation/translation_pl_PL.qm</file>
+        <file alias="translation_pl">translation/translation_pl_PL.qm</file>
     </qresource>
     <qresource prefix="/translations">
-        <file alias="translation_sk">res/translation/translation_sk_SK.qm</file>
+        <file alias="translation_sk">translation/translation_sk_SK.qm</file>
     </qresource>
     <qresource prefix="/translations">
-        <file alias="translation_sv">res/translation/translation_sv_SE.qm</file>
+        <file alias="translation_sv">translation/translation_sv_SE.qm</file>
     </qresource>
 	<qresource prefix="/translations">
-        <file alias="translation_zh_CN">res/translation/translation_zh_CN.qm</file>
+        <file alias="translation_zh_CN">translation/translation_zh_CN.qm</file>
     </qresource>
 
     <qresource prefix="/png/LEDs">

src/translation/wininstaller/installerlng.nsi

@@ -0,0 +1,36 @@
+; 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\translation\wininstaller\en.nsi" ; include english
+
+!insertmacro MUI_LANGUAGE "German"
+!include "${ROOT_PATH}\src\translation\wininstaller\de.nsi"
+
+!insertmacro MUI_LANGUAGE "Italian"
+!include "${ROOT_PATH}\src\translation\wininstaller\it.nsi" ; include italian
+
+!insertmacro MUI_LANGUAGE "Dutch"
+!include "${ROOT_PATH}\src\translation\wininstaller\nl.nsi"
+
+!insertmacro MUI_LANGUAGE "Polish"
+!include "${ROOT_PATH}\src\translation\wininstaller\pl.nsi"
+
+!insertmacro MUI_LANGUAGE "French"
+!include "${ROOT_PATH}\src\translation\wininstaller\fr.nsi"
+
+!insertmacro MUI_LANGUAGE "Spanish"
+!include "${ROOT_PATH}\src\translation\wininstaller\es.nsi"
+
+!insertmacro MUI_LANGUAGE "Swedish"
+!include "${ROOT_PATH}\src\translation\wininstaller\se.nsi"
+
+!insertmacro MUI_LANGUAGE "PortugueseBR"
+!include "${ROOT_PATH}\src\translation\wininstaller\pt_br.nsi"
+
+!insertmacro MUI_LANGUAGE "Portuguese"
+!include "${ROOT_PATH}\src\translation\wininstaller\pt.nsi"
+
+!insertmacro MUI_LANGUAGE "SimpChinese"
+!include "${ROOT_PATH}\src\translation\wininstaller\zh_cn.nsi"

tools/check-wininstaller-translations.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 set -eu
 
-BASE_DIR=src/res/translation/wininstaller/
+BASE_DIR=src/translation/wininstaller/
 BASE_LANG=en
 INSTALLERLNG=installerlng.nsi
 BASE_LANGSTRINGS=$(grep LangString "${BASE_DIR}/${BASE_LANG}.nsi" | cut -d' ' -f2)
 EXIT=0
-for LANGUAGE_FILE in src/res/translation/wininstaller/{??.nsi,??_??.nsi}; do
+for LANGUAGE_FILE in src/translation/wininstaller/{??.nsi,??_??.nsi}; do
     if [[ ${LANGUAGE_FILE} =~ /${BASE_LANG}.nsi$ ]]; then
         continue
     fi

tools/create-translation-issues.sh

@@ -141,7 +141,7 @@ get_languages() {
             echo "Error: Please ensure that you are at the root of a jamulus code checkout" >/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"

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):

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

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