diff --git a/crowdin.yml b/crowdin.yml index d4df00a60152..82b9d9921da6 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -10,9 +10,9 @@ files: translation: /mealie/lang/messages/%locale%.json # Resource Files - - source: /mealie/repos/seed/resources/foods/en-US.json - translation: /mealie/repos/seed/resources/foods/%locale%.json - - source: /mealie/repos/seed/resources/units/en-US.json - translation: /mealie/repos/seed/resources/units/%locale%.json - - source: /mealie/repos/seed/resources/labels/en-US.json - translation: /mealie/repos/seed/resources/labels/%locale%.json + - source: /mealie/repos/seed/resources/foods/locales/en-US.json + translation: /mealie/repos/seed/resources/foods/locales/%locale%.json + - source: /mealie/repos/seed/resources/units/locales/en-US.json + translation: /mealie/repos/seed/resources/units/locales/%locale%.json + - source: /mealie/repos/seed/resources/labels/locales/en-US.json + translation: /mealie/repos/seed/resources/labels/locales/%locale%.json diff --git a/mealie/repos/seed/resources/foods/__init__.py b/mealie/repos/seed/resources/foods/__init__.py index 1b128de10c11..3de54e8f125b 100644 --- a/mealie/repos/seed/resources/foods/__init__.py +++ b/mealie/repos/seed/resources/foods/__init__.py @@ -2,4 +2,4 @@ from pathlib import Path CWD = Path(__file__).parent -en_US = CWD / "en-US.json" +en_US = CWD / "locales" / "en-US.json" diff --git a/mealie/repos/seed/resources/foods/en-us.json b/mealie/repos/seed/resources/foods/locales/en-US.json similarity index 99% rename from mealie/repos/seed/resources/foods/en-us.json rename to mealie/repos/seed/resources/foods/locales/en-US.json index 47b6f3f50767..149241c29c9c 100644 --- a/mealie/repos/seed/resources/foods/en-us.json +++ b/mealie/repos/seed/resources/foods/locales/en-US.json @@ -221,4 +221,4 @@ "watermelon": "watermelon", "xanthan-gum": "xanthan gum", "yeast": "yeast" -} \ No newline at end of file +} diff --git a/mealie/repos/seed/resources/labels/__init__.py b/mealie/repos/seed/resources/labels/__init__.py index 1b128de10c11..3de54e8f125b 100644 --- a/mealie/repos/seed/resources/labels/__init__.py +++ b/mealie/repos/seed/resources/labels/__init__.py @@ -2,4 +2,4 @@ from pathlib import Path CWD = Path(__file__).parent -en_US = CWD / "en-US.json" +en_US = CWD / "locales" / "en-US.json" diff --git a/mealie/repos/seed/resources/labels/en-us.json b/mealie/repos/seed/resources/labels/locales/en-US.json similarity index 99% rename from mealie/repos/seed/resources/labels/en-us.json rename to mealie/repos/seed/resources/labels/locales/en-US.json index 9a671bad8a97..fe4d0175fcb7 100644 --- a/mealie/repos/seed/resources/labels/en-us.json +++ b/mealie/repos/seed/resources/labels/locales/en-US.json @@ -62,4 +62,4 @@ { "name": "Other" } -] \ No newline at end of file +] diff --git a/mealie/repos/seed/resources/units/__init__.py b/mealie/repos/seed/resources/units/__init__.py index 1b128de10c11..3de54e8f125b 100644 --- a/mealie/repos/seed/resources/units/__init__.py +++ b/mealie/repos/seed/resources/units/__init__.py @@ -2,4 +2,4 @@ from pathlib import Path CWD = Path(__file__).parent -en_US = CWD / "en-US.json" +en_US = CWD / "locales" / "en-US.json" diff --git a/mealie/repos/seed/resources/units/en-us.json b/mealie/repos/seed/resources/units/locales/en-US.json similarity index 99% rename from mealie/repos/seed/resources/units/en-us.json rename to mealie/repos/seed/resources/units/locales/en-US.json index 66444bb777f4..336525a5aa59 100644 --- a/mealie/repos/seed/resources/units/en-us.json +++ b/mealie/repos/seed/resources/units/locales/en-US.json @@ -99,4 +99,4 @@ "description": "", "abbreviation": "" } -} \ No newline at end of file +} diff --git a/mealie/repos/seed/seeders.py b/mealie/repos/seed/seeders.py index 349eb01c0488..26a6ecdabac0 100644 --- a/mealie/repos/seed/seeders.py +++ b/mealie/repos/seed/seeders.py @@ -5,11 +5,12 @@ from mealie.schema.labels import MultiPurposeLabelSave from mealie.schema.recipe.recipe_ingredient import SaveIngredientFood, SaveIngredientUnit from ._abstract_seeder import AbstractSeeder +from .resources import foods, labels, units class MultiPurposeLabelSeeder(AbstractSeeder): def load_data(self) -> Generator[MultiPurposeLabelSave, None, None]: - file = self.resources / "labels" / "en-us.json" + file = labels.en_US for label in json.loads(file.read_text()): yield MultiPurposeLabelSave( @@ -28,7 +29,7 @@ class MultiPurposeLabelSeeder(AbstractSeeder): class IngredientUnitsSeeder(AbstractSeeder): def load_data(self) -> Generator[SaveIngredientUnit, None, None]: - file = self.resources / "units" / "en-us.json" + file = units.en_US for unit in json.loads(file.read_text()).values(): yield SaveIngredientUnit( group_id=self.group_id, @@ -48,9 +49,9 @@ class IngredientUnitsSeeder(AbstractSeeder): class IngredientFoodsSeeder(AbstractSeeder): def load_data(self) -> Generator[SaveIngredientFood, None, None]: - file = self.resources / "foods" / "en-us.json" - foods: dict[str, str] = json.loads(file.read_text()) - for food in foods.values(): + file = foods.en_US + seed_foods: dict[str, str] = json.loads(file.read_text()) + for food in seed_foods.values(): yield SaveIngredientFood( group_id=self.group_id, name=food,