cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/TandoorRecipes/recipes into develop

Browse Source
This commit is contained in:
vabene1111 2024-02-11 10:00:54 +01:00
commit ad5562d850
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cookbook/helper/automation_helper.py
View File

@ -98,7 +98,7 @@ class AutomationEngine:
try:
return self.food_aliases[food.lower()]
except KeyError:
return food
return self.apply_regex_replace_automation(food, Automation.FOOD_REPLACE)
else:
if automation := Automation.objects.filter(space=self.request.space, type=Automation.FOOD_ALIAS, param_1__iexact=food, disabled=False).order_by('order').first():
return automation.param_2

8
cookbook/locale/nl/LC_MESSAGES/django.po
View File

@ -13,8 +13,8 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-05-18 14:28+0200\n"
"PO-Revision-Date: 2023-08-15 19:19+0000\n"
"Last-Translator: Jochum van der Heide <jochum@famvanderheide.com>\n"
"PO-Revision-Date: 2024-02-10 12:20+0000\n"
"Last-Translator: Jonan B <jonanb@pm.me>\n"
"Language-Team: Dutch <http://translate.tandoor.dev/projects/tandoor/"
"recipes-backend/nl/>\n"
"Language: nl\n"
@ -159,7 +159,7 @@ msgstr "Naam"
#: .\cookbook\forms.py:124 .\cookbook\forms.py:315 .\cookbook\views\lists.py:88
msgid "Keywords"
msgstr "Etiketten"
msgstr "Trefwoorden"
#: .\cookbook\forms.py:125
msgid "Preparation time in minutes"
@ -1224,7 +1224,7 @@ msgstr "Markdown gids"
#: .\cookbook\templates\base.html:329
msgid "GitHub"
msgstr "GitHub"
msgstr "Github"
#: .\cookbook\templates\base.html:331
msgid "Translate Tandoor"