Skip to content

Commit 01a43f2

Browse files
authored
feat: Added support for plural_name for foods (#4305)
1 parent 00baa39 commit 01a43f2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+28340
-9065
lines changed

mealie/repos/seed/resources/foods/locales/af-ZA.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/ar-SA.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/bg-BG.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/ca-ES.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/cs-CZ.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/da-DK.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/de-DE.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/el-GR.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/en-GB.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/en-US.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/es-ES.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/fi-FI.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/fr-BE.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/fr-CA.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/fr-FR.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/gl-ES.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/he-IL.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/hr-HR.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/hu-HU.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/is-IS.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/it-IT.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/ja-JP.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/ko-KR.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/lt-LT.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/lv-LV.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/nl-NL.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/no-NO.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/pl-PL.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/pt-BR.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/pt-PT.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/ro-RO.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/ru-RU.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/sk-SK.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/sl-SI.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/sr-SP.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/sv-SE.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/tr-TR.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/uk-UA.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/vi-VN.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/zh-CN.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/resources/foods/locales/zh-TW.json

Lines changed: 691 additions & 221 deletions
Large diffs are not rendered by default.

mealie/repos/seed/seeders.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,16 @@ def get_file(self, locale: str | None = None) -> pathlib.Path:
8383
def load_data(self, locale: str | None = None) -> Generator[SaveIngredientFood, None, None]:
8484
file = self.get_file(locale)
8585

86-
seed_foods: dict[str, str] = json.loads(file.read_text(encoding="utf-8"))
87-
for food in set(seed_foods.values()):
86+
seed_foods_names = set()
87+
for food in json.loads(file.read_text(encoding="utf-8")).values():
88+
if food["name"] in seed_foods_names:
89+
continue
90+
91+
seed_foods_names.add(food["name"])
8892
yield SaveIngredientFood(
8993
group_id=self.repos.group_id,
90-
name=food,
94+
name=food["name"],
95+
plural_name=food.get("plural_name"),
9196
description="",
9297
)
9398

tests/integration_tests/user_group_tests/test_group_seeder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def test_seed_invalid_locale(api_client: TestClient, unique_user: TestUser):
1212

1313

1414
def test_seed_foods(api_client: TestClient, unique_user: TestUser):
15-
CREATED_FOODS = 220
15+
CREATED_FOODS = 214
1616
database = unique_user.repos
1717

1818
# Check that the foods was created

0 commit comments

Comments
 (0)