From 992a74499d7bdb7f8e733768af4b5f57f94f5208 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 21 Jul 2025 15:52:31 +0200 Subject: [PATCH 1/3] chore(auto): Update pre-commit hooks (#5765) Co-authored-by: boc-the-git <3479092+boc-the-git@users.noreply.github.com> Co-authored-by: Kuchenpirat <24235032+Kuchenpirat@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a3a939778..91ce5b097 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,7 +12,7 @@ repos: exclude: ^tests/data/ - repo: https://github.com/astral-sh/ruff-pre-commit # Ruff version. - rev: v0.12.3 + rev: v0.12.4 hooks: - id: ruff - id: ruff-format From 5b92e969dc3c8ddd1b23f6da85f55000ffd7fa39 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 21 Jul 2025 14:02:45 +0000 Subject: [PATCH 2/3] docs(auto): Update image tag, for release v3.0.2 (#5769) Co-authored-by: Kuchenpirat <24235032+Kuchenpirat@users.noreply.github.com> --- .../getting-started/installation/installation-checklist.md | 2 +- .../docs/documentation/getting-started/installation/postgres.md | 2 +- docs/docs/documentation/getting-started/installation/sqlite.md | 2 +- frontend/package.json | 2 +- pyproject.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/docs/documentation/getting-started/installation/installation-checklist.md b/docs/docs/documentation/getting-started/installation/installation-checklist.md index 2a6a4534b..9bae44c00 100644 --- a/docs/docs/documentation/getting-started/installation/installation-checklist.md +++ b/docs/docs/documentation/getting-started/installation/installation-checklist.md @@ -31,7 +31,7 @@ To deploy mealie on your local network, it is highly recommended to use Docker t We've gone through a few versions of Mealie v1 deployment targets. We have settled on a single container deployment, and we've begun publishing the nightly container on github containers. If you're looking to move from the old nightly (split containers _or_ the omni image) to the new nightly, there are a few things you need to do: 1. Take a backup just in case! -2. Replace the image for the API container with `ghcr.io/mealie-recipes/mealie:v3.0.1` +2. Replace the image for the API container with `ghcr.io/mealie-recipes/mealie:v3.0.2` 3. Take the external port from the frontend container and set that as the port mapped to port `9000` on the new container. The frontend is now served on port 9000 from the new container, so it will need to be mapped for you to have access. 4. Restart the container diff --git a/docs/docs/documentation/getting-started/installation/postgres.md b/docs/docs/documentation/getting-started/installation/postgres.md index c666f798b..adb6320bf 100644 --- a/docs/docs/documentation/getting-started/installation/postgres.md +++ b/docs/docs/documentation/getting-started/installation/postgres.md @@ -7,7 +7,7 @@ PostgreSQL might be considered if you need to support many concurrent users. In ```yaml services: mealie: - image: ghcr.io/mealie-recipes/mealie:v3.0.1 # (3) + image: ghcr.io/mealie-recipes/mealie:v3.0.2 # (3) container_name: mealie restart: always ports: diff --git a/docs/docs/documentation/getting-started/installation/sqlite.md b/docs/docs/documentation/getting-started/installation/sqlite.md index cfad6d57b..38e436176 100644 --- a/docs/docs/documentation/getting-started/installation/sqlite.md +++ b/docs/docs/documentation/getting-started/installation/sqlite.md @@ -11,7 +11,7 @@ SQLite is a popular, open source, self-contained, zero-configuration database th ```yaml services: mealie: - image: ghcr.io/mealie-recipes/mealie:v3.0.1 # (3) + image: ghcr.io/mealie-recipes/mealie:v3.0.2 # (3) container_name: mealie restart: always ports: diff --git a/frontend/package.json b/frontend/package.json index 21ad93f99..b12f3fd6f 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "mealie", -"version": "3.0.1", +"version": "3.0.2", "private": true, "scripts": { "dev": "nuxt dev", diff --git a/pyproject.toml b/pyproject.toml index d75db69a7..625d5ca70 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ authors = ["Hayden "] description = "A Recipe Manager" license = "AGPL" name = "mealie" -version = "3.0.1" +version = "3.0.2" include = [ # Explicit include to override .gitignore when packaging the frontend { path = "mealie/frontend/**/*", format = ["sdist", "wheel"] } From 6d1e39f8714b88154789b2a45ea674f9c2a4cb26 Mon Sep 17 00:00:00 2001 From: Hayden <64056131+hay-kot@users.noreply.github.com> Date: Mon, 21 Jul 2025 09:12:38 -0500 Subject: [PATCH 3/3] chore(l10n): New Crowdin updates (#5770) --- .../seed/resources/foods/locales/da-DK.json | 24 ++++---- .../seed/resources/foods/locales/de-DE.json | 42 +++++++------- .../seed/resources/foods/locales/ru-RU.json | 58 +++++++++---------- 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/mealie/repos/seed/resources/foods/locales/da-DK.json b/mealie/repos/seed/resources/foods/locales/da-DK.json index e63d04362..c23c5cb57 100644 --- a/mealie/repos/seed/resources/foods/locales/da-DK.json +++ b/mealie/repos/seed/resources/foods/locales/da-DK.json @@ -105,7 +105,7 @@ }, "chile pepper": { "aliases": [ - "capsicum" + "peberfrugt" ], "description": "", "name": "chilipeber", @@ -138,38 +138,38 @@ "pumpkin": { "aliases": [], "description": "", - "name": "pumpkin", - "plural_name": "pumpkins" + "name": "græskar", + "plural_name": "græskar" }, "cauliflower": { "aliases": [], "description": "", - "name": "cauliflower", - "plural_name": "cauliflowers" + "name": "blomkål", + "plural_name": "blomkålshoveder" }, "cabbage": { "aliases": [], "description": "", "name": "cabbage", - "plural_name": "cabbages" + "plural_name": "kålhoveder" }, "asparagu": { "aliases": [], "description": "", - "name": "asparagu", - "plural_name": "asparagus" + "name": "asparges", + "plural_name": "asparges" }, "kale": { "aliases": [], "description": "", - "name": "kale", - "plural_name": "kales" + "name": "grønkål", + "plural_name": "grønkål" }, "arugula": { "aliases": [], "description": "", - "name": "arugula", - "plural_name": "arugulas" + "name": "rucola", + "plural_name": "rucola" }, "leek": { "aliases": [], diff --git a/mealie/repos/seed/resources/foods/locales/de-DE.json b/mealie/repos/seed/resources/foods/locales/de-DE.json index c8511c9e0..cc9d261eb 100644 --- a/mealie/repos/seed/resources/foods/locales/de-DE.json +++ b/mealie/repos/seed/resources/foods/locales/de-DE.json @@ -6215,7 +6215,7 @@ "dried chili": { "aliases": [], "description": "", - "name": "dried chili", + "name": "Getrocknete Chili", "plural_name": "dried chilies" }, "black cardamom": { @@ -6245,8 +6245,8 @@ "hot paprika": { "aliases": [], "description": "", - "name": "hot paprika", - "plural_name": "hot paprikas" + "name": "Scharfe Paprika", + "plural_name": "Scharfe Paprikas" }, "lemon thyme": { "aliases": [], @@ -6371,14 +6371,14 @@ "vietnamese mint": { "aliases": [], "description": "", - "name": "vietnamese mint", + "name": "Vietnamesische Minze", "plural_name": "vietnamese mints" }, "dried orange peel": { "aliases": [], "description": "", - "name": "dried orange peel", - "plural_name": "dried orange peels" + "name": "Getrocknete Orangenscheiben", + "plural_name": "Getrocknete Orangenscheiben" }, "espelette pepper": { "aliases": [], @@ -6868,7 +6868,7 @@ "mango syrup": { "aliases": [], "description": "", - "name": "mango syrup", + "name": "Mango Sirup", "plural_name": "mango syrups" }, "malt syrup": { @@ -7000,7 +7000,7 @@ "chocolate sugar": { "aliases": [], "description": "", - "name": "chocolate sugar", + "name": "Schokoladenzucker", "plural_name": "chocolate sugars" }, "flavored syrup": { @@ -7118,7 +7118,7 @@ "liquid smoke": { "aliases": [], "description": "", - "name": "liquid smoke", + "name": "flüssiger Rauch", "plural_name": "liquid smokes" }, "poultry seasoning": { @@ -7665,7 +7665,7 @@ "baking powder": { "aliases": [], "description": "", - "name": "baking powder", + "name": "Backpulver", "plural_name": "baking powders" }, "baking soda": { @@ -7739,7 +7739,7 @@ "gelatin": { "aliases": [], "description": "", - "name": "gelatin", + "name": "Gelatine", "plural_name": "gelatins" }, "pastry flour": { @@ -15647,19 +15647,19 @@ "pepsi": { "aliases": [], "description": "", - "name": "pepsi", - "plural_name": "pepsis" + "name": "Pepsi", + "plural_name": "Pepsis" }, "cherry soda": { "aliases": [], "description": "", - "name": "cherry soda", - "plural_name": "cherry sodas" + "name": "Kirschlimonade", + "plural_name": "Kirschlimonaden" }, "peppermint tea": { "aliases": [], "description": "", - "name": "peppermint tea", + "name": "Pfefferminztee", "plural_name": "peppermint teas" }, "sports drink": { @@ -15729,8 +15729,8 @@ "protein powder": { "aliases": [], "description": "", - "name": "protein powder", - "plural_name": "protein powders" + "name": "Proteinpulver", + "plural_name": "Proteinpulver" }, "lemon extract": { "aliases": [], @@ -16155,7 +16155,7 @@ "vitamin d": { "aliases": [], "description": "", - "name": "vitamin d", + "name": "Vitamin D", "plural_name": "vitamin ds" }, "calcium lactate": { @@ -16233,7 +16233,7 @@ "thc": { "aliases": [], "description": "", - "name": "thc", + "name": "THC", "plural_name": "thcs" }, "berry powder": { @@ -16299,7 +16299,7 @@ "maltodextrin": { "aliases": [], "description": "", - "name": "maltodextrin", + "name": "Maltodextrin", "plural_name": "maltodextrins" } } diff --git a/mealie/repos/seed/resources/foods/locales/ru-RU.json b/mealie/repos/seed/resources/foods/locales/ru-RU.json index 126718141..63160722c 100644 --- a/mealie/repos/seed/resources/foods/locales/ru-RU.json +++ b/mealie/repos/seed/resources/foods/locales/ru-RU.json @@ -303,14 +303,14 @@ "cayenne pepper": { "aliases": [], "description": "", - "name": "cayenne pepper", - "plural_name": "cayenne peppers" + "name": "кайенский перец", + "plural_name": "кайенский перец" }, "green tomato": { "aliases": [], "description": "", - "name": "green tomato", - "plural_name": "green tomatoes" + "name": "зелёный томат", + "plural_name": "зелёные томаты" }, "watercress": { "aliases": [], @@ -321,76 +321,76 @@ "iceberg": { "aliases": [], "description": "", - "name": "iceberg", - "plural_name": "icebergs" + "name": "салат айсберг", + "plural_name": "салат айсберг" }, "mashed potato": { "aliases": [], "description": "", - "name": "mashed potato", - "plural_name": "mashed potatoes" + "name": "картофельное пюре", + "plural_name": "картофельное пюре" }, "horseradish": { "aliases": [], "description": "", - "name": "horseradish", - "plural_name": "horseradishes" + "name": "хрен", + "plural_name": "хрен" }, "chard": { "aliases": [], "description": "", - "name": "chard", - "plural_name": "chards" + "name": "мангольд", + "plural_name": "мангольд" }, "pimiento": { "aliases": [], "description": "", - "name": "pimiento", - "plural_name": "pimientoes" + "name": "пимиенто", + "plural_name": "пимиенто" }, "spaghetti squash": { "aliases": [], "description": "", - "name": "spaghetti squash", - "plural_name": "spaghetti squashes" + "name": "тыква-спагетти", + "plural_name": "тыква-спагетти" }, "butter lettuce": { "aliases": [], "description": "", - "name": "butter lettuce", - "plural_name": "butter lettuces" + "name": "баттерхед", + "plural_name": "баттерхед" }, "hash brown": { "aliases": [], "description": "", - "name": "hash brown", - "plural_name": "hash browns" + "name": "хашбраун", + "plural_name": "хашбраун" }, "napa cabbage": { "aliases": [ - "chinese leaves" + "китайские листья" ], "description": "", - "name": "napa cabbage", - "plural_name": "napa cabbages" + "name": "пекинская капуста", + "plural_name": "пекинская капуста" }, "celeriac": { "aliases": [], "description": "", - "name": "celeriac", - "plural_name": "celeriacs" + "name": "корень сельдерея", + "plural_name": "корень сельдерея" }, "water chestnut": { "aliases": [], "description": "", - "name": "water chestnut", - "plural_name": "water chestnuts" + "name": "болотница сладкая", + "plural_name": "болотница сладкая" }, "turnip": { "aliases": [], "description": "", - "name": "turnip", - "plural_name": "turnips" + "name": "репа", + "plural_name": "репа" }, "thai chile pepper": { "aliases": [],