Merge branch 'master' into master

ss220club · Oct 30, 2023 · aeee108 · aeee108
2 parents 8bc013d + 7759e88
commit aeee108
Show file tree

Hide file tree

Showing 76 changed files with 70,664 additions and 45,186 deletions.
diff --git a/.github/workflows/auto_translate.yml b/.github/workflows/auto_translate.yml
@@ -5,6 +5,10 @@ on:
   push:
     branches: ['translate']
 
+concurrency:
+  group: translation
+  cancel-in-progress: false
+
 jobs:
   add_translation:
     runs-on: ubuntu-latest
@@ -45,6 +49,7 @@ jobs:
 
       - name: 'Generate Translation'
         run: |
+          git add ./tools/translator/ss220replace.json
           python ./tools/translator/converter.py
           [ ! -f ./ss220replace.json ] || mv ./ss220replace.json ./tools/translator/ss220replace.json
           git add ./tools/translator/ss220replace.json

diff --git a/.github/workflows/translate_branch_update.yml b/.github/workflows/translate_branch_update.yml
@@ -5,6 +5,10 @@ on:
   push:
     branches: ['master']
 
+concurrency:
+  group: translation
+  cancel-in-progress: false
+
 jobs:
   update_translation:
     runs-on: ubuntu-latest