Move fonts into language repo

fixed language pack script added workflow for languages workflow action version bump
PS2-Widescreen · May 26, 2022 · b7f9f98 · b7f9f98
1 parent 97599cc
commit b7f9f98
Show file tree

Hide file tree

Showing 35 changed files with 81 additions and 29 deletions.
diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml
@@ -33,15 +33,15 @@ jobs:
 
     - name: Upload release artifact ELF
       if: ${{ success() }}
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: OPNPS2LD
         path: |
           OPNPS2LD-*.ELF
 
     - name: Upload release artifact info
       if: ${{ success() }}
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: INFO
         path: |
@@ -65,7 +65,7 @@ jobs:
       run: apk add build-base git zip gawk python3 py3-pip bash
 
     - name: git checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - run: |
         git config --global --add safe.directory "$GITHUB_WORKSPACE"
@@ -87,11 +87,43 @@ jobs:
       run: sh ./make_changelog.sh
 
     - name: Upload variants artifact ELF
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: OPNPS2LD-VARIANTS
         path: OPNPS2LD*.ELF
 
+  build-lang:
+    runs-on: ubuntu-latest
+    container: ps2dev/ps2dev:latest
+    steps:
+    - name: Install dependencies
+      run: |
+        apk add build-base git zip gawk python3 py3-pip bash
+
+    - name: git checkout
+      uses: actions/checkout@v3
+
+    - run: |
+        git config --global --add safe.directory "$GITHUB_WORKSPACE"
+        git fetch --prune --unshallow
+
+    - name: Install Python packages
+      run: pip3 install -r requirements.txt
+
+    - name: Compile -> make download_lng languages
+      run: make --trace download_lng languages
+
+    - name: Create artifact
+      run: sh ./lng_pack.sh
+
+    - name: Upload release artifact
+      if: ${{ success() }}
+      uses: actions/upload-artifact@v3
+      with:
+        name: OPNPS2LD-LANGS
+        path: |
+          OPNPS2LD-LANGS-*.zip
+
   build-debug:
     strategy:
       fail-fast: false
@@ -104,7 +136,7 @@ jobs:
       run: apk add build-base git zip gawk python3 py3-pip bash
 
     - name: git checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - run: |
         git config --global --add safe.directory "$GITHUB_WORKSPACE"
@@ -123,21 +155,21 @@ jobs:
         mv opl.elf opl-${{ matrix.debug }}.elf
 
     - name: Upload variants artifact ELF
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: opl-debug-${{ steps.version.outputs.version }}-${{ matrix.docker }}
         path: opl-*.elf
 
   release:
-    needs: [build, build-variants]
+    needs: [build, build-variants, build-lang]
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master'
     env:
       USERNAME: ${{ secrets.USERNAME }}
       PASSWORD: ${{ secrets.PASSWORD }}
     steps:
     - name: git checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - run: git fetch --prune --unshallow
 
@@ -146,17 +178,22 @@ jobs:
       run: echo "::set-output name=version::$(make oplversion)"
 
     - name: Download release artifact
-      uses: actions/download-artifact@v1
+      uses: actions/download-artifact@v3
       with:
         name: OPNPS2LD
 
     - name: Download variants artifact
-      uses: actions/download-artifact@v1
+      uses: actions/download-artifact@v3
       with:
         name: OPNPS2LD-VARIANTS
 
+    - name: Download languages artifact
+      uses: actions/download-artifact@v3
+      with:
+        name: OPNPS2LD-LANGS
+
     - name: Download info artifact
-      uses: actions/download-artifact@v1
+      uses: actions/download-artifact@v3
       with:
         name: INFO
 
@@ -166,8 +203,10 @@ jobs:
         cp INFO/* OPNPS2LD-VARIANTS/
         7z a -t7z OPNPS2LD-${{ steps.version.outputs.version }}.7z OPNPS2LD/*
         7z a -t7z OPNPS2LD-VARIANTS-${{ steps.version.outputs.version }}.7z OPNPS2LD-VARIANTS/*
+        7z a -t7z OPNPS2LD-LANGS-${{ steps.version.outputs.version }}.7z OPNPS2LD-LANGS/*
         cp -f OPNPS2LD-${{ steps.version.outputs.version }}.7z OPNPS2LD.7z
         cp -f OPNPS2LD-VARIANTS-${{ steps.version.outputs.version }}.7z OPNPS2LD-VARIANTS.7z
+        cp -f OPNPS2LD-LANGS-${{ steps.version.outputs.version }}.7z OPNPS2LD-LANGS.7z
 
     - name: Create prerelease
       if: github.ref == 'refs/heads/master'
@@ -180,8 +219,10 @@ jobs:
         files: |
           OPNPS2LD-${{ steps.version.outputs.version }}.7z
           OPNPS2LD-VARIANTS-${{ steps.version.outputs.version }}.7z
+          OPNPS2LD-LANGS-${{ steps.version.outputs.version }}.7z
           OPNPS2LD.7z
           OPNPS2LD-VARIANTS.7z
+          OPNPS2LD-LANGS.7z
 
     - name: Create release
       if: startsWith(github.ref, 'refs/tags/v')
@@ -193,8 +234,10 @@ jobs:
         files: |
           OPNPS2LD-${{ steps.version.outputs.version }}.7z
           OPNPS2LD-VARIANTS-${{ steps.version.outputs.version }}.7z
+          OPNPS2LD-LANGS-${{ steps.version.outputs.version }}.7z
           OPNPS2LD.7z
           OPNPS2LD-VARIANTS.7z
+          OPNPS2LD-LANGS.7z
 
     - name: Upload pre-release to Mega
       if: github.ref == 'refs/heads/master' && env.USERNAME != null

diff --git a/.gitignore b/.gitignore
@@ -46,3 +46,4 @@ lng/lang_*.lng
 *lng_src
 src/lang_internal.c
 include/lang_autogen.h
+tmp/
diff --git a/lng/README.md b/lng/README.md
@@ -2,9 +2,9 @@
 
 ## For translators
 
-All translation files moved to the separate repository: <https://github.com/ps2homebrew/Open-PS2-Loader-lang>\
-Provide your submissions there.\
-Languages were moved there for reducing commit stress for the main repository.\
+All translation files moved to the separate repository: <https://github.com/ps2homebrew/Open-PS2-Loader-lang>\\
+Provide your submissions there.\\
+Languages were moved there for reducing commit stress for the main repository.\\
 Check if your `.yml` file has untranslated strings. Example:
 
 ```yml
@@ -20,16 +20,17 @@ You should change this into:
 ```
 
 If you want to test your changes:
+
 - run `make download_lng`
 - make your changes int `lng_src/*.yml`
 - run `make languages`
 - test generated file from `lng/lang_*.lng`.
 
 ## For developers
 
-If you add the language string into the code,\
-propose your changes into `lng_tmpl/_base.yml` with the necessary comments.\
-For example, if you add the string `_STR_NETWORK_STARTUP_ERROR`,\
+If you add the language string into the code,\\
+propose your changes into `lng_tmpl/_base.yml` with the necessary comments.\\
+For example, if you add the string `_STR_NETWORK_STARTUP_ERROR`,\\
 then you should update the base file like:
 
 ```yml
@@ -38,8 +39,8 @@ then you should update the base file like:
   string: '%d: Network startup error.'
 ```
 
-After running `make languages` propose your changes into [the language repo](https://github.com/ps2homebrew/Open-PS2-Loader-lang).\
+After running `make languages` propose your changes into [the language repo](https://github.com/ps2homebrew/Open-PS2-Loader-lang).\\
 Folder `lng_src` will contain updated files.
 
-It is not recommended to rename or remove already existing strings.\
+It is not recommended to rename or remove already existing strings.\\
 In such a case, you will need to edit all language yml files manually.
diff --git a/lng_pack.sh b/lng_pack.sh
@@ -4,9 +4,10 @@
 # Reworked by Doctor Q <[email protected]>
 
 # Set variables
+DATE=$(date +'%d %B %Y')
 CURRENT_DIR=$(pwd)
-BUILD_DIR="/tmp/OPL_LANG"
-LANG_LIST="/tmp/OPL_LANG_LIST"
+BUILD_DIR="$(pwd)/tmp/OPL_LANG"
+LANG_LIST="$(pwd)/tmp/OPL_LANG_LIST"
 make oplversion 2>/dev/null
 if [ $? == "0" ]
 then
@@ -25,16 +26,22 @@ else
 fi
 
 # Print a list
-printf "$(ls ${CURRENT_DIR}/lng/ | cut -c 6- | rev | cut -c 5- | rev)" > "${LANG_LIST}"
+mkdir -p "${BUILD_DIR}"
+cd "${CURRENT_DIR}/lng/"
+printf "$(ls ./*.lng | cut -c 6- | rev | cut -c 5- | rev)" > "${LANG_LIST}"
+cd "${CURRENT_DIR}"
 
 # Copy format
 while IFS= read -r CURRENT_FILE
 do
 	mkdir -p "${BUILD_DIR}/${CURRENT_FILE}-${OPL_VERSION}/"
 	cp "${CURRENT_DIR}/lng/lang_${CURRENT_FILE}.lng" "${BUILD_DIR}/${CURRENT_FILE}-${OPL_VERSION}/lang_${CURRENT_FILE}.lng"
-	if [ -e "thirdparty/font_${CURRENT_FILE}.ttf" ]
+	if [ -e "lng_src/thirdparty/font_${CURRENT_FILE}.ttf" ]
+	then
+		cp "${CURRENT_DIR}/lng_src/thirdparty/font_${CURRENT_FILE}.ttf" "${BUILD_DIR}/${CURRENT_FILE}-${OPL_VERSION}/font_${CURRENT_FILE}.ttf"
+	elif [ -e "lng_src/thirdparty/font_${CURRENT_FILE}.otf" ]
 	then
-		cp "${CURRENT_DIR}/thirdparty/font_${CURRENT_FILE}.ttf" "${BUILD_DIR}/${CURRENT_FILE}-${OPL_VERSION}/font_${CURRENT_FILE}.ttf"
+		cp "${CURRENT_DIR}/lng_src/thirdparty/font_${CURRENT_FILE}.otf" "${BUILD_DIR}/${CURRENT_FILE}-${OPL_VERSION}/font_${CURRENT_FILE}.otf"
 	fi
 done < ${LANG_LIST}
 
@@ -47,11 +54,11 @@ done < ${LANG_LIST}
 
 -----------------------------------------------------------------------------
 
-Open PS2 Loader Official Translations (25 August 2016)
+Open PS2 Loader Official Translations (${DATE})
 
 HOW TO INSTALL:
 1. make sure you are running latest OPL
-2. transfer both the the LANGUAGE FILE (.lng) and the FONT FILE (.ttf) into your OPL directory of your memory card
+2. transfer both the the LANGUAGE FILE (.lng) and the FONT FILE (.ttf/.otf) into your OPL directory of your memory card
  a. IMPORTANT: Do not rename the files
  b. NOTE: Some languages don't require a FONT file, so it won't be included
 3. run OPL
@@ -65,9 +72,9 @@ EOF
 
 # Lets pack it!
 cd ${BUILD_DIR}/
-zip -r "${CURRENT_DIR}/OPNPS2LD_LANGS-${OPL_VERSION}.zip" ./*
-if [ -f "${CURRENT_DIR}/OPNPS2LD_LANGS-${OPL_VERSION}.zip" ]
-	then echo "OPL Lang Package Complete: OPNPS2LD_LANGS-${OPL_VERSION}.zip"
+zip -r "${CURRENT_DIR}/OPNPS2LD-LANGS-${OPL_VERSION}.zip" ./*
+if [ -f "${CURRENT_DIR}/OPNPS2LD-LANGS-${OPL_VERSION}.zip" ]
+	then echo "OPL Lang Package Complete: OPNPS2LD-LANGS-${OPL_VERSION}.zip"
 	else echo "OPL Lang Package not found!"
 fi
 

diff --git a/thirdparty/font_Arabic.ttf b/thirdparty/font_Arabic.ttf
diff --git a/thirdparty/font_Bulgarian.ttf b/thirdparty/font_Bulgarian.ttf
diff --git a/thirdparty/font_Croatian.ttf b/thirdparty/font_Croatian.ttf
diff --git a/thirdparty/font_Czech.ttf b/thirdparty/font_Czech.ttf
diff --git a/thirdparty/font_Danish.ttf b/thirdparty/font_Danish.ttf
diff --git a/thirdparty/font_Dutch.ttf b/thirdparty/font_Dutch.ttf
diff --git a/thirdparty/font_Filipino.ttf b/thirdparty/font_Filipino.ttf
diff --git a/thirdparty/font_French.ttf b/thirdparty/font_French.ttf
diff --git a/thirdparty/font_German.ttf b/thirdparty/font_German.ttf
diff --git a/thirdparty/font_Greek.ttf b/thirdparty/font_Greek.ttf
diff --git a/thirdparty/font_Hebrew.ttf b/thirdparty/font_Hebrew.ttf
diff --git a/thirdparty/font_Hungarian.ttf b/thirdparty/font_Hungarian.ttf
diff --git a/thirdparty/font_Indonesian.ttf b/thirdparty/font_Indonesian.ttf
diff --git a/thirdparty/font_Italian.ttf b/thirdparty/font_Italian.ttf
diff --git a/thirdparty/font_Japanese.otf b/thirdparty/font_Japanese.otf
diff --git a/thirdparty/font_Korean.ttf b/thirdparty/font_Korean.ttf
diff --git a/thirdparty/font_Laotian.ttf b/thirdparty/font_Laotian.ttf
diff --git a/thirdparty/font_Norvegian.ttf b/thirdparty/font_Norvegian.ttf
diff --git a/thirdparty/font_Persian.ttf b/thirdparty/font_Persian.ttf
diff --git a/thirdparty/font_Polish.ttf b/thirdparty/font_Polish.ttf
diff --git a/thirdparty/font_Portuguese.ttf b/thirdparty/font_Portuguese.ttf
diff --git a/thirdparty/font_Portuguese_BR.ttf b/thirdparty/font_Portuguese_BR.ttf
diff --git a/thirdparty/font_Romana.otf b/thirdparty/font_Romana.otf
diff --git a/thirdparty/font_Russian.ttf b/thirdparty/font_Russian.ttf
diff --git a/thirdparty/font_SChinese.ttf b/thirdparty/font_SChinese.ttf
diff --git a/thirdparty/font_Spanish.ttf b/thirdparty/font_Spanish.ttf
diff --git a/thirdparty/font_Swedish.ttf b/thirdparty/font_Swedish.ttf
diff --git a/thirdparty/font_TChinese.ttf b/thirdparty/font_TChinese.ttf
diff --git a/thirdparty/font_Thai.ttf b/thirdparty/font_Thai.ttf
diff --git a/thirdparty/font_Turkish.ttf b/thirdparty/font_Turkish.ttf
diff --git a/thirdparty/font_Vietnamese.ttf b/thirdparty/font_Vietnamese.ttf