From 94d9ac03ead494d967df8cff00a12cbf47e1cdb2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Jul 2022 05:21:46 +0000 Subject: [PATCH 1/5] Bump terser from 4.8.0 to 4.8.1 in /vue Bumps [terser](https://github.com/terser/terser) from 4.8.0 to 4.8.1. - [Release notes](https://github.com/terser/terser/releases) - [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md) - [Commits](https://github.com/terser/terser/commits) --- updated-dependencies: - dependency-name: terser dependency-type: indirect ... Signed-off-by: dependabot[bot] --- vue/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vue/yarn.lock b/vue/yarn.lock index 14e34b9ad..8d83a2441 100644 --- a/vue/yarn.lock +++ b/vue/yarn.lock @@ -10508,9 +10508,9 @@ terser-webpack-plugin@^5.1.1, terser-webpack-plugin@^5.1.3: terser "^5.7.2" terser@^4.1.2, terser@^4.6.2: - version "4.8.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17" - integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw== + version "4.8.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f" + integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw== dependencies: commander "^2.20.0" source-map "~0.6.1" From c88566a4aef714f8b7e6dc227bce08834eeca902 Mon Sep 17 00:00:00 2001 From: tomtjes <7606307+tomtjes@users.noreply.github.com> Date: Fri, 22 Jul 2022 12:14:23 -0400 Subject: [PATCH 2/5] fix minor issues in CopyMeThat importer improve handling of empty fields and fields that exceed character limits --- cookbook/integration/copymethat.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cookbook/integration/copymethat.py b/cookbook/integration/copymethat.py index a581ab73d..421c967d7 100644 --- a/cookbook/integration/copymethat.py +++ b/cookbook/integration/copymethat.py @@ -24,7 +24,7 @@ class CopyMeThat(Integration): try: source = file.find("a", {"id": "original_link"}).text except AttributeError: - source = '' + source = None recipe = Recipe.objects.create(name=file.find("div", {"id": "name"}).text.strip()[:128], source_url=source, created_by=self.request.user, internal=True, space=self.request.space, ) @@ -58,10 +58,10 @@ class CopyMeThat(Integration): ingredients = file.find("ul", {"id": "recipeIngredients"}) if isinstance(ingredients, Tag): for ingredient in ingredients.children: - if not isinstance(ingredient, Tag) or ingredient.text == "": + if not isinstance(ingredient, Tag) or not ingredient.text.strip() or "recipeIngredient_spacer" in ingredient['class']: continue if any(x in ingredient['class'] for x in ["recipeIngredient_subheader", "recipeIngredient_note"]): - step.ingredients.add(Ingredient.objects.create(is_header=True, note=ingredient.text.strip(), original_text=ingredient.text.strip(), space=self.request.space, )) + step.ingredients.add(Ingredient.objects.create(is_header=True, note=ingredient.text.strip()[:256], original_text=ingredient.text.strip(), space=self.request.space, )) else: amount, unit, food, note = ingredient_parser.parse(ingredient.text.strip()) f = ingredient_parser.get_food(food) From 239a88cd241b877d187660838818b8b25d954480 Mon Sep 17 00:00:00 2001 From: Huth Jimmy Date: Mon, 25 Jul 2022 14:07:15 +0000 Subject: [PATCH 3/5] Translated using Weblate (French) Currently translated at 88.5% (378 of 427 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/ --- vue/src/locales/fr.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/vue/src/locales/fr.json b/vue/src/locales/fr.json index 34fdf3770..282f8428e 100644 --- a/vue/src/locales/fr.json +++ b/vue/src/locales/fr.json @@ -375,5 +375,11 @@ "Documentation": "Documentation", "New_Supermarket": "Créer un nouveau supermarché", "New_Supermarket_Category": "Créer une nouvelle catégorie de supermarché", - "and_down": "& Dessous" + "and_down": "& Dessous", + "recipe_filter": "Filtrer les recettes", + "no_more_images_found": "Pas d'images supplémentaires trouvées sur le site.", + "sql_debug": "Débogage de la base SQL", + "last_cooked": "Dernière recette utilisée", + "times_cooked": "Temps de cuisson", + "show_sortby": "Trier par" } From 1fae0047859768b81a810b04d43c2a61cac01192 Mon Sep 17 00:00:00 2001 From: Tomasz Klimczak Date: Mon, 25 Jul 2022 21:14:32 +0000 Subject: [PATCH 4/5] Translated using Weblate (Polish) Currently translated at 100.0% (427 of 427 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pl/ --- vue/src/locales/pl.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vue/src/locales/pl.json b/vue/src/locales/pl.json index 32d58db24..35e528fd3 100644 --- a/vue/src/locales/pl.json +++ b/vue/src/locales/pl.json @@ -425,5 +425,7 @@ "Message": "Wiadomość", "reset_food_inheritance": "Zresetuj dziedziczenie", "reset_food_inheritance_info": "Zresetuj wszystkie produkty spożywcze do domyślnych dziedziczonych pól i ich wartości nadrzędnych.", - "Valid Until": "Ważne do" + "Valid Until": "Ważne do", + "show_ingredient_overview": "Wyświetl listę wszystkich składników na początku przepisu.", + "Ingredient Overview": "Przegląd składników" } From b4e0b51f5bc2271d0c9af306d24d503f589e1050 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 00:13:53 +0000 Subject: [PATCH 5/5] Bump recipe-scrapers from 14.6.0 to 14.11.0 Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 14.6.0 to 14.11.0. - [Release notes](https://github.com/hhursev/recipe-scrapers/releases) - [Commits](https://github.com/hhursev/recipe-scrapers/compare/14.6.0...14.11.0) --- updated-dependencies: - dependency-name: recipe-scrapers dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3956181a5..0e183c62a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -28,7 +28,7 @@ Jinja2==3.1.2 django-webpack-loader==1.5.0 git+https://github.com/ierror/django-js-reverse@7cab78c4531780ab4b32033d5104ccd5be1a246a django-allauth==0.51.0 -recipe-scrapers==14.6.0 +recipe-scrapers==14.11.0 django-scopes==1.2.0.post1 pytest==7.1.2 pytest-django==4.5.2