Fixed Workflows to support necessary locale

1) Added all necessary locale languages to the Workflows (compile_card_db.yml and lint_and_test.yml) 2) Also OS dependent locale.setlocale switch in main.py 3) Had to rename "nl_du" to "nl_nl" to match a correct language code
sumpfork · Feb 11, 2024 · e8d494e · e8d494e
1 parent aae45bb
commit e8d494e
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 1 deletion.
diff --git a/.github/workflows/compile_card_db.yml b/.github/workflows/compile_card_db.yml
@@ -17,6 +17,19 @@ jobs:
         run: doit update_languages
       - run: |
           pip install .
+      - name: Install locales
+        run: |
+          apt-get update
+          apt-get -y install locales
+          locale-gen en_US
+          locale-gen de_DE
+          locale-gen fr_FR
+          locale-gen en_US
+          locale-gen es_ES
+          locale-gen it_IT
+          locale-gen nl_NL
+          locale-gen cs_CZ
+          locale -a
       - name: test generation with compiled Languages
         run: pytest -k "test_languages"
       - uses: dorny/paths-filter@v2

diff --git a/.github/workflows/lint_and_test.yml b/.github/workflows/lint_and_test.yml
@@ -13,6 +13,19 @@ jobs:
       - run: |
           pip install -r requirements.txt
           pip install .
+      - name: Install locales
+        run: |
+          apt-get update
+          apt-get -y install locales
+          locale-gen en_US
+          locale-gen de_DE
+          locale-gen fr_FR
+          locale-gen en_US
+          locale-gen es_ES
+          locale-gen it_IT
+          locale-gen nl_NL
+          locale-gen cs_CZ
+          locale -a
       - name: Lint
         run: pre-commit run --all-files
       - name: Test

diff --git a/card_db_src/nl_du/bonuses_nl_du.json → card_db_src/nl_nl/bonuses_nl_nl.json b/card_db_src/nl_du/bonuses_nl_du.json → card_db_src/nl_nl/bonuses_nl_nl.json
diff --git a/card_db_src/nl_du/bonuses_nl_du.json.gz → card_db_src/nl_nl/bonuses_nl_nl.json.gz b/card_db_src/nl_du/bonuses_nl_du.json.gz → card_db_src/nl_nl/bonuses_nl_nl.json.gz
diff --git a/card_db_src/nl_du/cards_nl_du.json → card_db_src/nl_nl/cards_nl_nl.json b/card_db_src/nl_du/cards_nl_du.json → card_db_src/nl_nl/cards_nl_nl.json
diff --git a/card_db_src/nl_du/cards_nl_du.json.gz → card_db_src/nl_nl/cards_nl_nl.json.gz b/card_db_src/nl_du/cards_nl_du.json.gz → card_db_src/nl_nl/cards_nl_nl.json.gz
diff --git a/card_db_src/nl_du/sets_nl_du.json → card_db_src/nl_nl/sets_nl_nl.json b/card_db_src/nl_du/sets_nl_du.json → card_db_src/nl_nl/sets_nl_nl.json
diff --git a/card_db_src/nl_du/sets_nl_du.json.gz → card_db_src/nl_nl/sets_nl_nl.json.gz b/card_db_src/nl_du/sets_nl_du.json.gz → card_db_src/nl_nl/sets_nl_nl.json.gz
diff --git a/card_db_src/nl_du/types_nl_du.json → card_db_src/nl_nl/types_nl_nl.json b/card_db_src/nl_du/types_nl_du.json → card_db_src/nl_nl/types_nl_nl.json
diff --git a/card_db_src/nl_du/types_nl_du.json.gz → card_db_src/nl_nl/types_nl_nl.json.gz b/card_db_src/nl_du/types_nl_du.json.gz → card_db_src/nl_nl/types_nl_nl.json.gz
diff --git a/...omdiv/card_db/nl_du/bonuses_nl_du.json.gz → ...omdiv/card_db/nl_nl/bonuses_nl_nl.json.gz b/...omdiv/card_db/nl_du/bonuses_nl_du.json.gz → ...omdiv/card_db/nl_nl/bonuses_nl_nl.json.gz
diff --git a/src/domdiv/card_db/nl_du/cards_nl_du.json.gz → src/domdiv/card_db/nl_nl/cards_nl_nl.json.gz b/src/domdiv/card_db/nl_du/cards_nl_du.json.gz → src/domdiv/card_db/nl_nl/cards_nl_nl.json.gz
diff --git a/src/domdiv/card_db/nl_du/sets_nl_du.json.gz → src/domdiv/card_db/nl_nl/sets_nl_nl.json.gz b/src/domdiv/card_db/nl_du/sets_nl_du.json.gz → src/domdiv/card_db/nl_nl/sets_nl_nl.json.gz
diff --git a/src/domdiv/card_db/nl_du/types_nl_du.json.gz → src/domdiv/card_db/nl_nl/types_nl_nl.json.gz b/src/domdiv/card_db/nl_du/types_nl_du.json.gz → src/domdiv/card_db/nl_nl/types_nl_nl.json.gz
diff --git a/src/domdiv/main.py b/src/domdiv/main.py
@@ -1500,7 +1500,10 @@ def __init__(self, order, lang, baseCards):
             self.baseCards.append(baseCards[tag])
 
         # Set the locale to the selected language. Necessary for correct sorting using accented characters
-        locale.setlocale(locale.LC_COLLATE, lang)
+        if os.name == "nt":
+            locale.setlocale(locale.LC_COLLATE, lang)
+        elif os.name == "posix":
+            locale.setlocale(locale.LC_COLLATE, (lang, ""))
 
     # When sorting cards, want to always put "base" cards after all
     # kingdom cards, and order the base cards in a particular order