Merge branch 'AlessandroFasse-german_translations'

sumpfork · Feb 6, 2022 · 8d04642 · 8d04642
2 parents 9e0a174 + 2ecf81a
commit 8d04642
Show file tree

Hide file tree

Showing 15 changed files with 552 additions and 345 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,8 @@ dominion_dividers.pdf
 dominion_dividers.png
 tools/card_db
 
-.doit.db
+.doit.db*
 .mypy_cache/
 .tox/
+
+venv
diff --git a/card_db_src/de/cards_de.json b/card_db_src/de/cards_de.json
diff --git a/card_db_src/de/sets_de.json b/card_db_src/de/sets_de.json
diff --git a/card_db_src/en_us/cards_en_us.json b/card_db_src/en_us/cards_en_us.json
@@ -2765,7 +2765,7 @@
         "name": "Cavalry"
     },
     "Groom": {
-        "description": "Gain a card costing up to 4 Coin If it's an...<n>Action card, gain a Horse;<n>Treasure card, gain a Silver;<n>Victory card, +1 Card and +1 Action.<n>",
+        "description": "Gain a card costing up to 4 Coin If it's an...<br>Action card, gain a Horse;<br>Treasure card, gain a Silver;<br>Victory card, +1 Card and +1 Action.",
         "extra": "First gain a card, then apply the bonuses in the order listed.<n>A card can give you multiple bonuses; for example, if you gain a Mill (from Intrigue), you gain a Horse and then get +1 Card and +1 Action.",
         "name": "Groom"
     },

diff --git a/dodo.py b/dodo.py
@@ -31,7 +31,12 @@ def task_update_languages():
         "file_dep": files + ["src/domdiv/tools/update_language.py"],
         "actions": [lambda: update_language.main("card_db_src", "src/domdiv/card_db")],
         "targets": [
-            os.path.join("src/domdiv/card_db", "/".join(fname.split("/")[1:]))
+            os.path.join(
+                "src",
+                "domdiv",
+                "card_db",
+                os.path.sep.join(fname.split(os.path.sep)[1:]),
+            )
             for fname in files
         ],
         "clean": True,

diff --git a/requirements.in b/requirements.in
@@ -2,4 +2,8 @@ reportlab
 Pillow
 pre-commit
 pytest
+# cloudpickle is needed by doit which cannot be in this list as it
+# installs platform-specific packages
+cloudpickle
 configargparse
+flake8<4 # Problem with pytest as shown here: https://github.com/tholo/pytest-flake8/issues/81
diff --git a/requirements.txt b/requirements.txt
@@ -8,22 +8,29 @@ attrs==21.4.0
     # via pytest
 cfgv==3.3.1
     # via pre-commit
+cloudpickle==2.0.0
+    # via -r requirements.in
 configargparse==1.5.3
     # via -r requirements.in
 distlib==0.3.4
     # via virtualenv
 filelock==3.4.2
     # via virtualenv
+flake8==3.9.2
+    # via -r requirements.in
 identify==2.4.8
     # via pre-commit
 importlib-metadata==4.10.1
     # via
+    #   flake8
     #   pluggy
     #   pre-commit
     #   pytest
     #   virtualenv
 iniconfig==1.1.1
     # via pytest
+mccabe==0.6.1
+    # via flake8
 nodeenv==1.6.0
     # via pre-commit
 packaging==21.3
@@ -40,6 +47,10 @@ pre-commit==2.17.0
     # via -r requirements.in
 py==1.11.0
     # via pytest
+pycodestyle==2.7.0
+    # via flake8
+pyflakes==2.3.1
+    # via flake8
 pyparsing==3.0.7
     # via packaging
 pytest==7.0.0

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [metadata]
-description-file = README.md
+description_file = README.md
 [tool:pytest]
 python_files = *tests.py
 addopts = --flake8

diff --git a/src/domdiv/card_db/cz/cards_cz.json b/src/domdiv/card_db/cz/cards_cz.json
@@ -1675,7 +1675,7 @@
         "name": "Goatherd"
     },
     "Groom": {
-        "description": "Gain a card costing up to 4 Coin If it's an...<n>Action card, gain a Horse;<n>Treasure card, gain a Silver;<n>Victory card, +1 Card and +1 Action.<n>",
+        "description": "Gain a card costing up to 4 Coin If it's an...<br>Action card, gain a Horse;<br>Treasure card, gain a Silver;<br>Victory card, +1 Card and +1 Action.",
         "extra": "First gain a card, then apply the bonuses in the order listed.<n>A card can give you multiple bonuses; for example, if you gain a Mill (from Intrigue), you gain a Horse and then get +1 Card and +1 Action.",
         "name": "Groom"
     },

diff --git a/src/domdiv/card_db/de/cards_de.json b/src/domdiv/card_db/de/cards_de.json
diff --git a/src/domdiv/card_db/de/sets_de.json b/src/domdiv/card_db/de/sets_de.json
diff --git a/src/domdiv/card_db/en_us/cards_en_us.json b/src/domdiv/card_db/en_us/cards_en_us.json
@@ -1675,7 +1675,7 @@
         "name": "Goatherd"
     },
     "Groom": {
-        "description": "Gain a card costing up to 4 Coin If it's an...<n>Action card, gain a Horse;<n>Treasure card, gain a Silver;<n>Victory card, +1 Card and +1 Action.<n>",
+        "description": "Gain a card costing up to 4 Coin If it's an...<br>Action card, gain a Horse;<br>Treasure card, gain a Silver;<br>Victory card, +1 Card and +1 Action.",
         "extra": "First gain a card, then apply the bonuses in the order listed.<n>A card can give you multiple bonuses; for example, if you gain a Mill (from Intrigue), you gain a Horse and then get +1 Card and +1 Action.",
         "name": "Groom"
     },

diff --git a/src/domdiv/card_db/fr/cards_fr.json b/src/domdiv/card_db/fr/cards_fr.json
@@ -1675,7 +1675,7 @@
         "name": "Goatherd"
     },
     "Groom": {
-        "description": "Gain a card costing up to 4 Coin If it's an...<n>Action card, gain a Horse;<n>Treasure card, gain a Silver;<n>Victory card, +1 Card and +1 Action.<n>",
+        "description": "Gain a card costing up to 4 Coin If it's an...<br>Action card, gain a Horse;<br>Treasure card, gain a Silver;<br>Victory card, +1 Card and +1 Action.",
         "extra": "First gain a card, then apply the bonuses in the order listed.<n>A card can give you multiple bonuses; for example, if you gain a Mill (from Intrigue), you gain a Horse and then get +1 Card and +1 Action.",
         "name": "Groom"
     },

diff --git a/src/domdiv/card_db/it/cards_it.json b/src/domdiv/card_db/it/cards_it.json
@@ -1675,7 +1675,7 @@
         "name": "Goatherd"
     },
     "Groom": {
-        "description": "Gain a card costing up to 4 Coin If it's an...<n>Action card, gain a Horse;<n>Treasure card, gain a Silver;<n>Victory card, +1 Card and +1 Action.<n>",
+        "description": "Gain a card costing up to 4 Coin If it's an...<br>Action card, gain a Horse;<br>Treasure card, gain a Silver;<br>Victory card, +1 Card and +1 Action.",
         "extra": "First gain a card, then apply the bonuses in the order listed.<n>A card can give you multiple bonuses; for example, if you gain a Mill (from Intrigue), you gain a Horse and then get +1 Card and +1 Action.",
         "name": "Groom"
     },

diff --git a/src/domdiv/card_db/xx/cards_xx.json b/src/domdiv/card_db/xx/cards_xx.json
@@ -1675,7 +1675,7 @@
         "name": "Goatherd"
     },
     "Groom": {
-        "description": "Gain a card costing up to 4 Coin If it's an...<n>Action card, gain a Horse;<n>Treasure card, gain a Silver;<n>Victory card, +1 Card and +1 Action.<n>",
+        "description": "Gain a card costing up to 4 Coin If it's an...<br>Action card, gain a Horse;<br>Treasure card, gain a Silver;<br>Victory card, +1 Card and +1 Action.",
         "extra": "First gain a card, then apply the bonuses in the order listed.<n>A card can give you multiple bonuses; for example, if you gain a Mill (from Intrigue), you gain a Horse and then get +1 Card and +1 Action.",
         "name": "Groom"
     },