Merge branch 'develop'

Fix path traversal in manual installation steps

.env.template

@@ -97,7 +97,7 @@ GUNICORN_MEDIA=0
 # ACCOUNT_EMAIL_SUBJECT_PREFIX=
 
 # allow authentication via reverse proxy (e.g. authelia), leave off if you dont know what you are doing
-# see docs for more information https://vabene1111.github.io/recipes/features/authentication/
+# see docs for more information https://docs.tandoor.dev/features/authentication/
 # when unset: 0 (false)
 REVERSE_PROXY_AUTH=0
 
@@ -126,7 +126,7 @@ REVERSE_PROXY_AUTH=0
 # ENABLE_METRICS=0
 
 # allows you to setup OAuth providers
-# see docs for more information https://vabene1111.github.io/recipes/features/authentication/
+# see docs for more information https://docs.tandoor.dev/features/authentication/
 # SOCIAL_PROVIDERS = allauth.socialaccount.providers.github, allauth.socialaccount.providers.nextcloud,
 
 # Should a newly created user from a social provider get assigned to the default space and given permission by default ?

.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 name: Continuous Integration
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
@@ -14,13 +14,13 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python 3.10
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: '3.10'
     # Build Vue frontend
-    - uses: actions/setup-node@v2
+    - uses: actions/setup-node@v3
       with:
-        node-version: '14'
+        node-version: '16'
     - name: Install Vue dependencies
       working-directory: ./vue
       run: yarn install
@@ -30,7 +30,7 @@ jobs:
     - name: Install Django dependencies
       run: |
         sudo apt-get -y update
-        sudo apt-get install -y libsasl2-dev python-dev libldap2-dev libssl-dev
+        sudo apt-get install -y libsasl2-dev python3-dev libldap2-dev libssl-dev
         python -m pip install --upgrade pip
         pip install -r requirements.txt
         python3 manage.py collectstatic --noinput

.gitignore

@@ -84,3 +84,4 @@ cookbook/static/vue
 vue/webpack-stats.json
 cookbook/templates/sw.js
 .prettierignore
+vue/.yarn

.idea/recipes.iml

@@ -18,7 +18,7 @@
       <excludeFolder url="file://$MODULE_DIR$/staticfiles" />
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.9 (recipes)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.11 (recipes)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TemplatesService">

README.md

@@ -71,8 +71,7 @@ Because of that there are several ways you can support us
 - **Let us host for you** We are offering a [hosted version](https://app.tandoor.dev) where all profits support us and the development of tandoor (currently only available in germany).  
 
 ## Contributing
-
-You can help out with the ongoing development by looking for potential bugs in our code base, or by contributing new features. We are always welcoming new pull requests containing bug fixes, refactors and new features. We have a list of tasks and bugs on our issue tracker on Github. Please comment on issues if you want to contribute with, to avoid duplicating effort.
+Contributions are welcome but please read [this](https://docs.tandoor.dev/contribute/#contributing-code) **BEFORE** contributing anything!
 
 ## Your Feedback
 

SECURITY.md

@@ -6,5 +6,4 @@ Since this software is still considered beta/WIP support is always only given fo
 
 ## Reporting a Vulnerability
 
-Please open a normal public issue if you have any security related concerns. If you feel like the issue should not be discussed in 
-public just open a generic issue and we will discuss further communication there (since GitHub does not allow everyone to create a security advisory :/).
+Please use GitHub Security Advisories to report any kind of security vulnerabilities.

cookbook/admin.py

@@ -36,7 +36,7 @@ def delete_space_action(modeladmin, request, queryset):
 
 
 class SpaceAdmin(admin.ModelAdmin):
-    list_display = ('name', 'created_by', 'max_recipes', 'max_users', 'max_file_storage_mb', 'allow_sharing')
+    list_display = ('name', 'created_by', 'max_recipes', 'max_users', 'max_file_storage_mb', 'allow_sharing', 'use_plural')
     search_fields = ('name', 'created_by__username')
     list_filter = ('max_recipes', 'max_users', 'max_file_storage_mb', 'allow_sharing')
     date_hierarchy = 'created_at'

cookbook/forms.py

@@ -154,6 +154,7 @@ class ImportExportBase(forms.Form):
     COOKBOOKAPP = 'COOKBOOKAPP'
     COPYMETHAT = 'COPYMETHAT'
     COOKMATE = 'COOKMATE'
+    REZEPTSUITEDE = 'REZEPTSUITEDE'
     PDF = 'PDF'
 
     type = forms.ChoiceField(choices=(
@@ -162,7 +163,7 @@ class ImportExportBase(forms.Form):
         (PEPPERPLATE, 'Pepperplate'), (RECETTETEK, 'RecetteTek'), (RECIPESAGE, 'Recipe Sage'), (DOMESTICA, 'Domestica'),
         (MEALMASTER, 'MealMaster'), (REZKONV, 'RezKonv'), (OPENEATS, 'Openeats'), (RECIPEKEEPER, 'Recipe Keeper'),
         (PLANTOEAT, 'Plantoeat'), (COOKBOOKAPP, 'CookBookApp'), (COPYMETHAT, 'CopyMeThat'), (PDF, 'PDF'), (MELARECIPES, 'Melarecipes'),
-        (COOKMATE, 'Cookmate')
+        (COOKMATE, 'Cookmate'), (REZEPTSUITEDE, 'Recipesuite.de')
     ))
 
 
@@ -533,11 +534,13 @@ class SpacePreferenceForm(forms.ModelForm):
     class Meta:
         model = Space
 
-        fields = ('food_inherit', 'reset_food_inherit', 'show_facet_count')
+        fields = ('food_inherit', 'reset_food_inherit', 'show_facet_count', 'use_plural')
 
         help_texts = {
             'food_inherit': _('Fields on food that should be inherited by default.'),
-            'show_facet_count': _('Show recipe counts on search filters'), }
+            'show_facet_count': _('Show recipe counts on search filters'), 
+            'use_plural': _('Use the plural form for units and food inside this space.'),
+        }
 
         widgets = {
             'food_inherit': MultiSelectWidget

cookbook/helper/ingredient_parser.py

@@ -28,7 +28,7 @@ class IngredientParser:
                 self.food_aliases = c
                 caches['default'].touch(FOOD_CACHE_KEY, 30)
             else:
-                for a in Automation.objects.filter(space=self.request.space, disabled=False, type=Automation.FOOD_ALIAS).only('param_1', 'param_2').all():
+                for a in Automation.objects.filter(space=self.request.space, disabled=False, type=Automation.FOOD_ALIAS).only('param_1', 'param_2').order_by('order').all():
                     self.food_aliases[a.param_1] = a.param_2
                 caches['default'].set(FOOD_CACHE_KEY, self.food_aliases, 30)
 
@@ -37,7 +37,7 @@ class IngredientParser:
                 self.unit_aliases = c
                 caches['default'].touch(UNIT_CACHE_KEY, 30)
             else:
-                for a in Automation.objects.filter(space=self.request.space, disabled=False, type=Automation.UNIT_ALIAS).only('param_1', 'param_2').all():
+                for a in Automation.objects.filter(space=self.request.space, disabled=False, type=Automation.UNIT_ALIAS).only('param_1', 'param_2').order_by('order').all():
                     self.unit_aliases[a.param_1] = a.param_2
                 caches['default'].set(UNIT_CACHE_KEY, self.unit_aliases, 30)
         else:
@@ -59,7 +59,7 @@ class IngredientParser:
                 except KeyError:
                     return food
             else:
-                if automation := Automation.objects.filter(space=self.request.space, type=Automation.FOOD_ALIAS, param_1=food, disabled=False).first():
+                if automation := Automation.objects.filter(space=self.request.space, type=Automation.FOOD_ALIAS, param_1=food, disabled=False).order_by('order').first():
                     return automation.param_2
         return food
 
@@ -78,7 +78,7 @@ class IngredientParser:
                 except KeyError:
                     return unit
             else:
-                if automation := Automation.objects.filter(space=self.request.space, type=Automation.UNIT_ALIAS, param_1=unit, disabled=False).first():
+                if automation := Automation.objects.filter(space=self.request.space, type=Automation.UNIT_ALIAS, param_1=unit, disabled=False).order_by('order').first():
                     return automation.param_2
         return unit
 
@@ -235,6 +235,14 @@ class IngredientParser:
         # leading spaces before commas result in extra tokens, clean them out
         ingredient = ingredient.replace(' ,', ',')
 
+        # handle "(from) - (to)" amounts by using the minimum amount and adding the range to the description
+        # "10.5 - 200 g XYZ" => "100 g XYZ (10.5 - 200)"
+        ingredient = re.sub("^(\d+|\d+[\\.,]\d+) - (\d+|\d+[\\.,]\d+) (.*)", "\\1 \\3 (\\1 - \\2)", ingredient)
+
+        # if amount and unit are connected add space in between
+        if re.match('([0-9])+([A-z])+\s', ingredient):
+            ingredient = re.sub(r'(?<=([a-z])|\d)(?=(?(1)\d|[a-z]))', ' ', ingredient)
+
         tokens = ingredient.split()  # split at each space into tokens
         if len(tokens) == 1:
             # there only is one argument, that must be the food

cookbook/helper/mdx_urlize.py

@@ -35,6 +35,7 @@ Negative examples:
 u'<p>del.icio.us</p>'
 
 """
+from xml.etree.ElementTree import Element
 
 import markdown
 
@@ -64,7 +65,7 @@ class UrlizePattern(markdown.inlinepatterns.Pattern):
             else:
                 url = 'http://' + url
 
-        el = markdown.util.etree.Element("a")
+        el = Element("a")
         el.set('href', url)
         el.text = markdown.util.AtomicString(text)
         return el

cookbook/helper/permission_helper.py

@@ -52,7 +52,6 @@ def has_group_permission(user, groups, no_cache=False):
             return cached_result
 
     result = False
-    print('running check', user, groups_allowed)
     if user.is_authenticated:
         if user_space := user.userspace_set.filter(active=True):
             if len(user_space) != 1:

cookbook/helper/recipe_url_import.py

@@ -12,7 +12,8 @@ from recipe_scrapers._utils import get_host_name, get_minutes
 
 from cookbook.helper import recipe_url_import as helper
 from cookbook.helper.ingredient_parser import IngredientParser
-from cookbook.models import Keyword
+from cookbook.models import Keyword, Automation
+
 
 # from recipe_scrapers._utils import get_minutes  ## temporary until/unless upstream incorporates get_minutes() PR
 
@@ -121,7 +122,13 @@ def get_from_scraper(scrape, request):
         try:
             keywords.append(source_url.replace('http://', '').replace('https://', '').split('/')[0])
         except Exception:
-            pass
+            recipe_json['source_url'] = ''
+
+    try:
+        if scrape.author():
+            keywords.append(scrape.author())
+    except:
+        pass
 
     try:
         recipe_json['keywords'] = parse_keywords(list(set(map(str.casefold, keywords))), request.space)
@@ -139,42 +146,58 @@ def get_from_scraper(scrape, request):
     if len(recipe_json['steps']) == 0:
         recipe_json['steps'].append({'instruction': '', 'ingredients': [], })
 
-    if len(parse_description(description)) > 256:  # split at 256 as long descriptions dont look good on recipe cards
-        recipe_json['steps'][0]['instruction'] = f'*{parse_description(description)}*  \n\n' + recipe_json['steps'][0]['instruction']
+    parsed_description = parse_description(description)
+    # TODO notify user about limit if reached
+    # limits exist to limit the attack surface for dos style attacks
+    automations = Automation.objects.filter(type=Automation.DESCRIPTION_REPLACE, space=request.space, disabled=False).only('param_1', 'param_2', 'param_3').all().order_by('order')[:512]
+    for a in automations:
+        if re.match(a.param_1, (recipe_json['source_url'])[:512]):
+            parsed_description = re.sub(a.param_2, a.param_3, parsed_description, count=1)
+
+    if len(parsed_description) > 256:  # split at 256 as long descriptions don't look good on recipe cards
+        recipe_json['steps'][0]['instruction'] = f'*{parsed_description}*  \n\n' + recipe_json['steps'][0]['instruction']
     else:
-        recipe_json['description'] = parse_description(description)[:512]
+        recipe_json['description'] = parsed_description[:512]
 
     try:
         for x in scrape.ingredients():
-            try:
-                amount, unit, ingredient, note = ingredient_parser.parse(x)
-                ingredient = {
-                    'amount': amount,
-                    'food': {
-                        'name': ingredient,
-                    },
-                    'unit': None,
-                    'note': note,
-                    'original_text': x
-                }
-                if unit:
-                    ingredient['unit'] = {'name': unit, }
-                recipe_json['steps'][0]['ingredients'].append(ingredient)
-            except Exception:
-                recipe_json['steps'][0]['ingredients'].append(
-                    {
-                        'amount': 0,
-                        'unit': None,
+            if x.strip() != '':
+                try:
+                    amount, unit, ingredient, note = ingredient_parser.parse(x)
+                    ingredient = {
+                        'amount': amount,
                         'food': {
-                            'name': x,
+                            'name': ingredient,
                         },
-                        'note': '',
+                        'unit': None,
+                        'note': note,
                         'original_text': x
                     }
-                )
+                    if unit:
+                        ingredient['unit'] = {'name': unit, }
+                    recipe_json['steps'][0]['ingredients'].append(ingredient)
+                except Exception:
+                    recipe_json['steps'][0]['ingredients'].append(
+                        {
+                            'amount': 0,
+                            'unit': None,
+                            'food': {
+                                'name': x,
+                            },
+                            'note': '',
+                            'original_text': x
+                        }
+                    )
     except Exception:
         pass
 
+    if recipe_json['source_url']:
+        automations = Automation.objects.filter(type=Automation.INSTRUCTION_REPLACE, space=request.space, disabled=False).only('param_1', 'param_2', 'param_3').order_by('order').all()[:512]
+        for a in automations:
+            if re.match(a.param_1, (recipe_json['source_url'])[:512]):
+                for s in recipe_json['steps']:
+                    s['instruction'] = re.sub(a.param_2, a.param_3, s['instruction'])
+
     return recipe_json
 
 

cookbook/helper/template_helper.py

@@ -22,10 +22,25 @@ class IngredientObject(object):
         else:
             self.amount = f"<scalable-number v-bind:number='{bleach.clean(str(ingredient.amount))}' v-bind:factor='ingredient_factor'></scalable-number>"
         if ingredient.unit:
-            self.unit = bleach.clean(str(ingredient.unit))
+            if ingredient.unit.plural_name in (None, ""):
+                self.unit = bleach.clean(str(ingredient.unit))
+            else:
+                if ingredient.always_use_plural_unit or ingredient.amount > 1 and not ingredient.no_amount:
+                    self.unit = bleach.clean(ingredient.unit.plural_name)
+                else:
+                    self.unit = bleach.clean(str(ingredient.unit))
         else:
             self.unit = ""
-        self.food = bleach.clean(str(ingredient.food))
+        if ingredient.food:
+            if ingredient.food.plural_name in (None, ""):
+                self.food = bleach.clean(str(ingredient.food))
+            else:
+                if ingredient.always_use_plural_food or ingredient.amount > 1 and not ingredient.no_amount:
+                    self.food = bleach.clean(str(ingredient.food.plural_name))
+                else:
+                    self.food = bleach.clean(str(ingredient.food))
+        else:
+            self.food = ""
         self.note = bleach.clean(str(ingredient.note))
 
     def __str__(self):

cookbook/integration/integration.py

@@ -1,16 +1,12 @@
-import time
+import traceback
 import datetime
-import json
 import traceback
 import uuid
-from io import BytesIO, StringIO
+from io import BytesIO
 from zipfile import BadZipFile, ZipFile
 
-import lxml
-from django.core.cache import cache
-import datetime
-
 from bs4 import Tag
+from django.core.cache import cache
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.files import File
 from django.db import IntegrityError
@@ -20,8 +16,7 @@ from django.utils.translation import gettext as _
 from django_scopes import scope
 from lxml import etree
 
-from cookbook.forms import ImportExportBase
-from cookbook.helper.image_processing import get_filetype, handle_image
+from cookbook.helper.image_processing import handle_image
 from cookbook.models import Keyword, Recipe
 from recipes.settings import DEBUG
 from recipes.settings import EXPORT_FILE_CACHE_DURATION
@@ -182,7 +177,7 @@ class Integration:
                                 traceback.print_exc()
                                 self.handle_exception(e, log=il, message=f'-------------------- \nERROR \n{e}\n--------------------\n')
                         import_zip.close()
-                    elif '.json' in f['name'] or '.txt' in f['name'] or '.mmf' in f['name'] or '.rk' in f['name'] or '.melarecipe' in f['name']:
+                    elif '.json' in f['name'] or '.xml' in f['name'] or '.txt' in f['name'] or '.mmf' in f['name'] or '.rk' in f['name'] or '.melarecipe' in f['name']:
                         data_list = self.split_recipe_file(f['file'])
                         il.total_recipes += len(data_list)
                         for d in data_list:

cookbook/integration/nextcloud_cookbook.py

@@ -1,13 +1,14 @@
 import json
 import re
-from io import BytesIO
+from io import BytesIO, StringIO
 from zipfile import ZipFile
+from PIL import Image
 
 from cookbook.helper.image_processing import get_filetype
 from cookbook.helper.ingredient_parser import IngredientParser
 from cookbook.helper.recipe_url_import import iso_duration_to_minutes
 from cookbook.integration.integration import Integration
-from cookbook.models import Ingredient, Keyword, Recipe, Step
+from cookbook.models import Ingredient, Keyword, Recipe, Step, NutritionInformation
 
 
 class NextcloudCookbook(Integration):
@@ -70,12 +71,21 @@ class NextcloudCookbook(Integration):
             recipe.steps.add(step)
 
         if 'nutrition' in recipe_json:
+            nutrition = {}
             try:
-                recipe.nutrition.calories = recipe_json['nutrition']['calories'].replace(' kcal', '').replace(' ', '')
-                recipe.nutrition.proteins = recipe_json['nutrition']['calories'].replace(' g', '').replace(',', '.').replace(' ', '')
-                recipe.nutrition.fats = recipe_json['nutrition']['calories'].replace(' g', '').replace(',', '.').replace(' ', '')
-                recipe.nutrition.carbohydrates = recipe_json['nutrition']['calories'].replace(' g', '').replace(',', '.').replace(' ', '')
-            except Exception:
+                if 'calories' in recipe_json['nutrition']:
+                    nutrition['calories'] = int(re.search(r'\d+', recipe_json['nutrition']['calories']).group())
+                if 'proteinContent' in recipe_json['nutrition']:
+                    nutrition['proteins'] = int(re.search(r'\d+', recipe_json['nutrition']['proteinContent']).group())
+                if 'fatContent' in recipe_json['nutrition']:
+                    nutrition['fats'] = int(re.search(r'\d+', recipe_json['nutrition']['fatContent']).group())
+                if 'carbohydrateContent' in recipe_json['nutrition']:
+                    nutrition['carbohydrates'] = int(re.search(r'\d+', recipe_json['nutrition']['carbohydrateContent']).group())
+
+                if nutrition != {}:
+                    recipe.nutrition = NutritionInformation.objects.create(**nutrition, space=self.request.space)
+                    recipe.save()
+            except Exception as e:
                 pass
 
         for f in self.files:
@@ -87,5 +97,92 @@ class NextcloudCookbook(Integration):
 
         return recipe
 
+    def formatTime(self, min):
+        h = min//60
+        m = min % 60
+        return f'PT{h}H{m}M0S'
+
+
     def get_file_from_recipe(self, recipe):
-        raise NotImplementedError('Method not implemented in storage integration')
+
+        export = {}
+        export['name'] = recipe.name
+        export['description'] = recipe.description
+        export['url'] = recipe.source_url
+        export['prepTime'] = self.formatTime(recipe.working_time)
+        export['cookTime'] = self.formatTime(recipe.waiting_time)
+        export['totalTime'] = self.formatTime(recipe.working_time+recipe.waiting_time)
+        export['recipeYield'] = recipe.servings
+        export['image'] = f'/Recipes/{recipe.name}/full.jpg'
+        export['imageUrl'] = f'/Recipes/{recipe.name}/full.jpg'
+
+        recipeKeyword = []
+        for k in recipe.keywords.all():
+            recipeKeyword.append(k.name)
+
+        export['keywords'] = recipeKeyword
+
+        recipeInstructions = []
+        recipeIngredient = []
+        for s in recipe.steps.all():
+            recipeInstructions.append(s.instruction)
+
+            for i in s.ingredients.all():
+                recipeIngredient.append(f'{float(i.amount)} {i.unit} {i.food}')
+
+        export['recipeIngredient'] = recipeIngredient
+        export['recipeInstructions'] = recipeInstructions
+
+
+        return "recipe.json", json.dumps(export)
+
+    def get_files_from_recipes(self, recipes, el, cookie):
+        export_zip_stream = BytesIO()
+        export_zip_obj = ZipFile(export_zip_stream, 'w')
+
+        for recipe in recipes:
+            if recipe.internal and recipe.space == self.request.space:
+
+                recipe_stream = StringIO()
+                filename, data = self.get_file_from_recipe(recipe)
+                recipe_stream.write(data)
+                export_zip_obj.writestr(f'{recipe.name}/{filename}', recipe_stream.getvalue())
+                recipe_stream.close()
+
+                try:
+                    imageByte = recipe.image.file.read()
+                    export_zip_obj.writestr(f'{recipe.name}/full.jpg', self.getJPEG(imageByte))
+                    export_zip_obj.writestr(f'{recipe.name}/thumb.jpg', self.getThumb(171, imageByte))
+                    export_zip_obj.writestr(f'{recipe.name}/thumb16.jpg', self.getThumb(16, imageByte))
+                except ValueError:
+                    pass
+
+            el.exported_recipes += 1
+            el.msg += self.get_recipe_processed_msg(recipe)
+            el.save()
+
+        export_zip_obj.close()
+
+        return [[ self.get_export_file_name(), export_zip_stream.getvalue() ]]
+
+    def getJPEG(self, imageByte):
+        image = Image.open(BytesIO(imageByte))
+        image = image.convert('RGB')
+
+        bytes = BytesIO()
+        image.save(bytes, "JPEG")
+        return bytes.getvalue()
+    
+    def getThumb(self, size, imageByte):
+        image = Image.open(BytesIO(imageByte))
+
+        w, h = image.size
+        m = min(w, h) 
+
+        image = image.crop(((w-m)//2, (h-m)//2, (w+m)//2, (h+m)//2))
+        image = image.resize([size, size], Image.Resampling.LANCZOS)
+        image = image.convert('RGB')
+
+        bytes = BytesIO()
+        image.save(bytes, "JPEG")
+        return bytes.getvalue()

cookbook/integration/recettetek.py

@@ -61,7 +61,7 @@ class RecetteTek(Integration):
             ingredient_parser = IngredientParser(self.request, True)
             for ingredient in file['ingredients'].split('\n'):
                 if len(ingredient.strip()) > 0:
-                    amount, unit, food, note = ingredient_parser.parse(food)
+                    amount, unit, food, note = ingredient_parser.parse(ingredient.strip())
                     f = ingredient_parser.get_food(ingredient)
                     u = ingredient_parser.get_unit(unit)
                     step.ingredients.add(Ingredient.objects.create(

cookbook/integration/recipekeeper.py

@@ -41,7 +41,7 @@ class RecipeKeeper(Integration):
         except AttributeError:
             pass
 
-        step = Step.objects.create(instruction='', space=self.request.space,)
+        step = Step.objects.create(instruction='', space=self.request.space, )
 
         ingredient_parser = IngredientParser(self.request, True)
         for ingredient in file.find("div", {"itemprop": "recipeIngredients"}).findChildren("p"):
@@ -51,13 +51,20 @@ class RecipeKeeper(Integration):
             f = ingredient_parser.get_food(food)
             u = ingredient_parser.get_unit(unit)
             step.ingredients.add(Ingredient.objects.create(
-                food=f, unit=u, amount=amount, note=note, original_text=ingredient, space=self.request.space,
+                food=f, unit=u, amount=amount, note=note, original_text=str(ingredient).replace('<p>', '').replace('</p>', ''), space=self.request.space,
             ))
 
         for s in file.find("div", {"itemprop": "recipeDirections"}).find_all("p"):
             if s.text == "":
                 continue
             step.instruction += s.text + ' \n'
+            step.save()
+
+        for s in file.find("div", {"itemprop": "recipeNotes"}).find_all("p"):
+            if s.text == "":
+                continue
+            step.instruction += s.text + ' \n'
+            step.save()
 
         if file.find("span", {"itemprop": "recipeSource"}).text != '':
             step.instruction += "\n\n" + _("Imported from") + ": " + file.find("span", {"itemprop": "recipeSource"}).text

cookbook/integration/rezeptsuitede.py

@@ -0,0 +1,59 @@
+from xml import etree
+
+from lxml import etree
+
+from cookbook.helper.ingredient_parser import IngredientParser
+from cookbook.helper.recipe_url_import import parse_time, parse_servings, parse_servings_text
+from cookbook.integration.integration import Integration
+from cookbook.models import Ingredient, Recipe, Step
+
+
+class Rezeptsuitede(Integration):
+
+    def split_recipe_file(self, file):
+        xml_file = etree.parse(file).getroot().getchildren()
+        recipe_list = xml_file.find('recipe')
+        return recipe_list
+
+    def get_recipe_from_file(self, file):
+        recipe_xml = file
+
+        recipe = Recipe.objects.create(
+            name=recipe_xml.find('title').text.strip(),
+            created_by=self.request.user, internal=True, space=self.request.space)
+
+        if recipe_xml.find('servingtype') is not None and recipe_xml.find('servingtype').text is not None:
+            recipe.servings = parse_servings(recipe_xml.find('servingtype').text.strip())
+            recipe.servings_text = parse_servings_text(recipe_xml.find('servingtype').text.strip())
+
+        if recipe_xml.find('description') is not None:  # description is a list of <li>'s with text
+            if len(recipe_xml.find('description')) > 0:
+                recipe.description = recipe_xml.find('description')[0].text[:512]
+
+        for step in recipe_xml.find('step'):
+            if step.text:
+                step = Step.objects.create(
+                    instruction=step.text.strip(), space=self.request.space,
+                )
+                recipe.steps.add(step)
+
+        ingredient_parser = IngredientParser(self.request, True)
+
+        if recipe_xml.find('ingredient'):
+            ingredient_step = recipe.steps.first()
+            if ingredient_step is None:
+                ingredient_step = Step.objects.create(space=self.request.space, instruction='')
+
+            for ingredient in recipe_xml.find('ingredient'):
+                f = ingredient_parser.get_food(ingredient.attrib['item'])
+                u = ingredient_parser.get_unit(ingredient.attrib['unit'])
+                ingredient_step.ingredients.add(Ingredient.objects.create(
+                    food=f, unit=u, amount=ingredient.attrib['qty'], original_text=ingredient.text.strip(), space=self.request.space,
+                ))
+
+        recipe.save()
+
+        return recipe
+
+    def get_file_from_recipe(self, recipe):
+        raise NotImplementedError('Method not implemented in storage integration')

cookbook/locale/cs/LC_MESSAGES/django.po

@@ -6,20 +6,22 @@
 # Translators:
 # Pavel Solař <pavelsolar86@gmail.com>, 2021
 # 
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-02-09 18:01+0100\n"
-"PO-Revision-Date: 2020-06-02 19:28+0000\n"
-"Last-Translator: Pavel Solař <pavelsolar86@gmail.com>, 2021\n"
-"Language-Team: Czech (https://www.transifex.com/django-recipes/teams/110507/cs/)\n"
+"PO-Revision-Date: 2023-01-08 17:55+0000\n"
+"Last-Translator: Joachim Weber <joachim.weber@gmx.de>\n"
+"Language-Team: Czech <http://translate.tandoor.dev/projects/tandoor/"
+"recipes-backend/cs/>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n "
+"<= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"X-Generator: Weblate 4.15\n"
 
 #: .\cookbook\filters.py:22 .\cookbook\templates\base.html:87
 #: .\cookbook\templates\forms\edit_internal_recipe.html:219
@@ -173,7 +175,7 @@ msgstr "Potravina, která by měla být nahrazena."
 
 #: .\cookbook\forms.py:198
 msgid "Add your comment: "
-msgstr "Přidat  vlastní komentář:"
+msgstr "Přidat vlastní komentář: "
 
 #: .\cookbook\forms.py:229
 msgid "Leave empty for dropbox and enter app password for nextcloud."

cookbook/locale/hy/LC_MESSAGES/django.po

@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-02-09 18:01+0100\n"
-"PO-Revision-Date: 2021-10-13 12:50+0000\n"
-"Last-Translator: Hrachya Kocharyan <hkocharyan@ctemplar.com>\n"
+"PO-Revision-Date: 2023-01-08 17:55+0000\n"
+"Last-Translator: Joachim Weber <joachim.weber@gmx.de>\n"
 "Language-Team: Armenian <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/hy/>\n"
 "Language: hy\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Weblate 4.8\n"
+"X-Generator: Weblate 4.15\n"
 
 #: .\cookbook\filters.py:22 .\cookbook\templates\base.html:87
 #: .\cookbook\templates\forms\edit_internal_recipe.html:219
@@ -410,7 +410,7 @@ msgstr "Դուրս գալ"
 
 #: .\cookbook\templates\account\logout.html:11
 msgid "Are you sure you want to sign out?"
-msgstr "Համոզվա՞ծ եք, որ ցանկանում եք դուրս գալ:"
+msgstr "Համոզվա՞ծ եք, որ ցանկանում եք դուրս գալ՞"
 
 #: .\cookbook\templates\account\password_reset.html:5
 #: .\cookbook\templates\account\password_reset_done.html:5

cookbook/locale/ru/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-09-13 22:40+0200\n"
-"PO-Revision-Date: 2022-04-07 19:32+0000\n"
-"Last-Translator: Artem Aksenov <artemmillerr@gmail.com>\n"
+"PO-Revision-Date: 2022-11-30 19:09+0000\n"
+"Last-Translator: Alex <kovsharoff@gmail.com>\n"
 "Language-Team: Russian <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/ru/>\n"
 "Language: ru\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.10.1\n"
+"X-Generator: Weblate 4.14.1\n"
 
 #: .\cookbook\filters.py:23 .\cookbook\templates\base.html:125
 #: .\cookbook\templates\forms\ingredients.html:34
@@ -396,8 +396,9 @@ msgstr ""
 #: .\cookbook\templates\include\log_cooking.html:16
 #: .\cookbook\templates\url_import.html:224
 #: .\cookbook\templates\url_import.html:455
+#, fuzzy
 msgid "Servings"
-msgstr ""
+msgstr "Порции"
 
 #: .\cookbook\integration\safron.py:25
 msgid "Waiting time"
@@ -468,7 +469,7 @@ msgstr ""
 
 #: .\cookbook\models.py:198 .\cookbook\templates\base.html:90
 msgid "Books"
-msgstr ""
+msgstr "Книги"
 
 #: .\cookbook\models.py:206
 msgid "Small"

cookbook/migrations/0185_food_plural_name_ingredient_always_use_plural_food_and_more.py

@@ -0,0 +1,38 @@
+# Generated by Django 4.0.8 on 2022-11-22 06:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0184_alter_userpreference_image'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='food',
+            name='plural_name',
+            field=models.CharField(blank=True, default=None, max_length=128, null=True),
+        ),
+        migrations.AddField(
+            model_name='ingredient',
+            name='always_use_plural_food',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='ingredient',
+            name='always_use_plural_unit',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='space',
+            name='use_plural',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='unit',
+            name='plural_name',
+            field=models.CharField(blank=True, default=None, max_length=128, null=True),
+        ),
+    ]

cookbook/migrations/0186_automation_order_alter_automation_type.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.1.4 on 2023-01-03 21:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0185_food_plural_name_ingredient_always_use_plural_food_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='automation',
+            name='order',
+            field=models.IntegerField(default=1000),
+        ),
+        migrations.AlterField(
+            model_name='automation',
+            name='type',
+            field=models.CharField(choices=[('FOOD_ALIAS', 'Food Alias'), ('UNIT_ALIAS', 'Unit Alias'), ('KEYWORD_ALIAS', 'Keyword Alias'), ('DESCRIPTION_REPLACE', 'Description Replace'), ('INSTRUCTION_REPLACE', 'Instruction Replace')], max_length=128),
+        ),
+    ]

cookbook/migrations/0187_alter_space_use_plural.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.4 on 2023-01-20 09:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0186_automation_order_alter_automation_type'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='space',
+            name='use_plural',
+            field=models.BooleanField(default=True),
+        ),
+    ]

cookbook/models.py

@@ -260,6 +260,7 @@ class Space(ExportModelOperationsMixin('space'), models.Model):
     max_recipes = models.IntegerField(default=0)
     max_file_storage_mb = models.IntegerField(default=0, help_text=_('Maximum file storage for space in MB. 0 for unlimited, -1 to disable file upload.'))
     max_users = models.IntegerField(default=0)
+    use_plural = models.BooleanField(default=True)
     allow_sharing = models.BooleanField(default=True)
     demo = models.BooleanField(default=False)
     food_inherit = models.ManyToManyField(FoodInheritField, blank=True)
@@ -366,7 +367,7 @@ class UserPreference(models.Model, PermissionModelMixin):
     )
 
     user = AutoOneToOneField(User, on_delete=models.CASCADE, primary_key=True)
-    image = models.ForeignKey("UserFile", on_delete=models.SET_NULL, null=True,blank=True, related_name='user_image')
+    image = models.ForeignKey("UserFile", on_delete=models.SET_NULL, null=True, blank=True, related_name='user_image')
     theme = models.CharField(choices=THEMES, max_length=128, default=TANDOOR)
     nav_color = models.CharField(choices=COLORS, max_length=128, default=PRIMARY)
     default_unit = models.CharField(max_length=32, default='g')
@@ -530,6 +531,7 @@ class Keyword(ExportModelOperationsMixin('keyword'), TreeModel, PermissionModelM
 
 class Unit(ExportModelOperationsMixin('unit'), models.Model, PermissionModelMixin):
     name = models.CharField(max_length=128, validators=[MinLengthValidator(1)])
+    plural_name = models.CharField(max_length=128, null=True, blank=True, default=None)
     description = models.TextField(blank=True, null=True)
 
     space = models.ForeignKey(Space, on_delete=models.CASCADE)
@@ -554,6 +556,7 @@ class Food(ExportModelOperationsMixin('food'), TreeModel, PermissionModelMixin):
     if SORT_TREE_BY_NAME:
         node_order_by = ['name']
     name = models.CharField(max_length=128, validators=[MinLengthValidator(1)])
+    plural_name = models.CharField(max_length=128, null=True, blank=True, default=None)
     recipe = models.ForeignKey('Recipe', null=True, blank=True, on_delete=models.SET_NULL)
     supermarket_category = models.ForeignKey(SupermarketCategory, null=True, blank=True, on_delete=models.SET_NULL)  # inherited field
     ignore_shopping = models.BooleanField(default=False)  # inherited field
@@ -654,6 +657,8 @@ class Ingredient(ExportModelOperationsMixin('ingredient'), models.Model, Permiss
     note = models.CharField(max_length=256, null=True, blank=True)
     is_header = models.BooleanField(default=False)
     no_amount = models.BooleanField(default=False)
+    always_use_plural_unit = models.BooleanField(default=False)
+    always_use_plural_food = models.BooleanField(default=False)
     order = models.IntegerField(default=0)
     original_text = models.CharField(max_length=512, null=True, blank=True, default=None)
 
@@ -663,7 +668,23 @@ class Ingredient(ExportModelOperationsMixin('ingredient'), models.Model, Permiss
     objects = ScopedManager(space='space')
 
     def __str__(self):
-        return str(self.amount) + ' ' + str(self.unit) + ' ' + str(self.food)
+        food = ""
+        unit = ""
+        if self.always_use_plural_food and self.food.plural_name not in (None, "") and not self.no_amount:
+            food = self.food.plural_name
+        else:
+            if self.amount > 1 and self.food.plural_name not in (None, "") and not self.no_amount:
+                food = self.food.plural_name
+            else:
+                food = str(self.food)
+        if self.always_use_plural_unit and self.unit.plural_name not in (None, "") and not self.no_amount:
+            unit = self.unit.plural_name
+        else:
+            if self.amount > 1 and self.unit.plural_name not in (None, "") and not self.no_amount:
+                unit = self.unit.plural_name
+            else:
+                unit = str(self.unit)
+        return str(self.amount) + ' ' + str(unit) + ' ' + str(food)
 
     class Meta:
         ordering = ['order', 'pk']
@@ -1202,9 +1223,12 @@ class Automation(ExportModelOperationsMixin('automations'), models.Model, Permis
     FOOD_ALIAS = 'FOOD_ALIAS'
     UNIT_ALIAS = 'UNIT_ALIAS'
     KEYWORD_ALIAS = 'KEYWORD_ALIAS'
+    DESCRIPTION_REPLACE = 'DESCRIPTION_REPLACE'
+    INSTRUCTION_REPLACE = 'INSTRUCTION_REPLACE'
 
     type = models.CharField(max_length=128,
-                            choices=((FOOD_ALIAS, _('Food Alias')), (UNIT_ALIAS, _('Unit Alias')), (KEYWORD_ALIAS, _('Keyword Alias')),))
+                            choices=((FOOD_ALIAS, _('Food Alias')), (UNIT_ALIAS, _('Unit Alias')), (KEYWORD_ALIAS, _('Keyword Alias')),
+                                     (DESCRIPTION_REPLACE, _('Description Replace')), (INSTRUCTION_REPLACE, _('Instruction Replace')),))
     name = models.CharField(max_length=128, default='')
     description = models.TextField(blank=True, null=True)
 
@@ -1212,6 +1236,8 @@ class Automation(ExportModelOperationsMixin('automations'), models.Model, Permis
     param_2 = models.CharField(max_length=128, blank=True, null=True)
     param_3 = models.CharField(max_length=128, blank=True, null=True)
 
+    order = models.IntegerField(default=1000)
+
     disabled = models.BooleanField(default=False)
 
     updated_at = models.DateTimeField(auto_now=True)

cookbook/serializer.py

@@ -277,7 +277,8 @@ class SpaceSerializer(WritableNestedModelSerializer):
     class Meta:
         model = Space
         fields = ('id', 'name', 'created_by', 'created_at', 'message', 'max_recipes', 'max_file_storage_mb', 'max_users',
-                  'allow_sharing', 'demo', 'food_inherit', 'show_facet_count', 'user_count', 'recipe_count', 'file_size_mb', 'image',)
+                  'allow_sharing', 'demo', 'food_inherit', 'show_facet_count', 'user_count', 'recipe_count', 'file_size_mb',
+                  'image', 'use_plural',)
         read_only_fields = ('id', 'created_by', 'created_at', 'max_recipes', 'max_file_storage_mb', 'max_users', 'allow_sharing', 'demo',)
 
 
@@ -431,17 +432,22 @@ class UnitSerializer(UniqueFieldsMixin, ExtendedRecipeMixin):
 
     def create(self, validated_data):
         name = validated_data.pop('name').strip()
+        plural_name = validated_data.pop('plural_name', None)
+        if plural_name:
+            plural_name = plural_name.strip()
         space = validated_data.pop('space', self.context['request'].space)
-        obj, created = Unit.objects.get_or_create(name=name, space=space, defaults=validated_data)
+        obj, created = Unit.objects.get_or_create(name=name, plural_name=plural_name, space=space, defaults=validated_data)
         return obj
 
     def update(self, instance, validated_data):
         validated_data['name'] = validated_data['name'].strip()
+        if plural_name := validated_data.get('plural_name', None):
+            validated_data['plural_name'] = plural_name.strip()
         return super(UnitSerializer, self).update(instance, validated_data)
 
     class Meta:
         model = Unit
-        fields = ('id', 'name', 'description', 'numrecipe', 'image')
+        fields = ('id', 'name', 'plural_name', 'description', 'numrecipe', 'image')
         read_only_fields = ('id', 'numrecipe', 'image')
 
 
@@ -499,7 +505,7 @@ class RecipeSimpleSerializer(WritableNestedModelSerializer):
 class FoodSimpleSerializer(serializers.ModelSerializer):
     class Meta:
         model = Food
-        fields = ('id', 'name')
+        fields = ('id', 'name', 'plural_name')
 
 
 class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedRecipeMixin):
@@ -538,6 +544,9 @@ class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedR
 
     def create(self, validated_data):
         name = validated_data.pop('name').strip()
+        plural_name = validated_data.pop('plural_name', None)
+        if plural_name:
+            plural_name = plural_name.strip()
         space = validated_data.pop('space', self.context['request'].space)
         # supermarket category needs to be handled manually as food.get or create does not create nested serializers unlike a super.create of serializer
         if 'supermarket_category' in validated_data and validated_data['supermarket_category']:
@@ -562,12 +571,14 @@ class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedR
             else:
                 validated_data['onhand_users'] = list(set(onhand_users) - set(shared_users))
 
-        obj, created = Food.objects.get_or_create(name=name, space=space, defaults=validated_data)
+        obj, created = Food.objects.get_or_create(name=name, plural_name=plural_name, space=space, defaults=validated_data)
         return obj
 
     def update(self, instance, validated_data):
         if name := validated_data.get('name', None):
             validated_data['name'] = name.strip()
+        if plural_name := validated_data.get('plural_name', None):
+            validated_data['plural_name'] = plural_name.strip()
         # assuming if on hand for user also onhand for shopping_share users
         onhand = validated_data.get('food_onhand', None)
         reset_inherit = self.initial_data.get('reset_inherit', False)
@@ -587,7 +598,7 @@ class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedR
     class Meta:
         model = Food
         fields = (
-            'id', 'name', 'description', 'shopping', 'recipe', 'food_onhand', 'supermarket_category',
+            'id', 'name', 'plural_name', 'description', 'shopping', 'recipe', 'food_onhand', 'supermarket_category',
             'image', 'parent', 'numchild', 'numrecipe', 'inherit_fields', 'full_name', 'ignore_shopping',
             'substitute', 'substitute_siblings', 'substitute_children', 'substitute_onhand', 'child_inherit_fields'
         )
@@ -616,6 +627,7 @@ class IngredientSimpleSerializer(WritableNestedModelSerializer):
         fields = (
             'id', 'food', 'unit', 'amount', 'note', 'order',
             'is_header', 'no_amount', 'original_text', 'used_in_recipes',
+            'always_use_plural_unit', 'always_use_plural_food',
         )
 
 
@@ -864,11 +876,11 @@ class ShoppingListRecipeSerializer(serializers.ModelSerializer):
         value = value.quantize(
             Decimal(1)) if value == value.to_integral() else value.normalize()  # strips trailing zero
         return (
-                       obj.name
-                       or getattr(obj.mealplan, 'title', None)
-                       or (d := getattr(obj.mealplan, 'date', None)) and ': '.join([obj.mealplan.recipe.name, str(d)])
-                       or obj.recipe.name
-               ) + f' ({value:.2g})'
+                obj.name
+                or getattr(obj.mealplan, 'title', None)
+                or (d := getattr(obj.mealplan, 'date', None)) and ': '.join([obj.mealplan.recipe.name, str(d)])
+                or obj.recipe.name
+        ) + f' ({value:.2g})'
 
     def update(self, instance, validated_data):
         # TODO remove once old shopping list
@@ -1055,7 +1067,7 @@ class AutomationSerializer(serializers.ModelSerializer):
     class Meta:
         model = Automation
         fields = (
-            'id', 'type', 'name', 'description', 'param_1', 'param_2', 'param_3', 'disabled', 'created_by',)
+            'id', 'type', 'name', 'description', 'param_1', 'param_2', 'param_3', 'order', 'disabled', 'created_by',)
         read_only_fields = ('created_by',)
 
 
@@ -1162,7 +1174,7 @@ class SupermarketCategoryExportSerializer(SupermarketCategorySerializer):
 class UnitExportSerializer(UnitSerializer):
     class Meta:
         model = Unit
-        fields = ('name', 'description')
+        fields = ('name', 'plural_name', 'description')
 
 
 class FoodExportSerializer(FoodSerializer):
@@ -1170,7 +1182,7 @@ class FoodExportSerializer(FoodSerializer):
 
     class Meta:
         model = Food
-        fields = ('name', 'ignore_shopping', 'supermarket_category',)
+        fields = ('name', 'plural_name', 'ignore_shopping', 'supermarket_category',)
 
 
 class IngredientExportSerializer(WritableNestedModelSerializer):
@@ -1184,7 +1196,7 @@ class IngredientExportSerializer(WritableNestedModelSerializer):
 
     class Meta:
         model = Ingredient
-        fields = ('food', 'unit', 'amount', 'note', 'order', 'is_header', 'no_amount')
+        fields = ('food', 'unit', 'amount', 'note', 'order', 'is_header', 'no_amount', 'always_use_plural_unit', 'always_use_plural_food')
 
 
 class StepExportSerializer(WritableNestedModelSerializer):

cookbook/static/themes/tandoor.min.css

@@ -10438,8 +10438,6 @@ footer a:hover {
     padding: 5px 0 20px 39px
 }
 
-/*# sourceMappingURL=maps/style.min.css.map */
-
 .bg-header {
     background-color: rgb(221, 191, 134) !important;
 }

cookbook/templates/account/login.html

@@ -35,9 +35,7 @@
                 {% endif %}
 
                 {% if EMAIL_ENABLED %}
-                    <a class="btn btn-warning float-right d-none d-xl-block d-lg-block"
-                       href="{% url 'account_reset_password' %}">{% trans "Reset My Password" %}</a>
-                    <p class="d-xl-none d-lg-none">{% trans 'Lost your password?' %} <a
+                    <p>{% trans 'Lost your password?' %} <a
                             href="{% url 'account_reset_password' %}">{% trans "Reset My Password" %}</a></p>
                 {% endif %}
             </form>

cookbook/templates/base.html

@@ -19,7 +19,7 @@
     <link rel="mask-icon" href="{% static 'assets/safari-pinned-tab.svg' %}" color="#161616">
     <link rel="apple-touch-icon" href="{% static 'assets/apple-touch-icon.png' %}" sizes="180x180">
 
-    <link rel="manifest" href="{% url 'web_manifest' %}">
+    <link rel="manifest" crossorigin="use-credentials" href="{% url 'web_manifest' %}">
     <meta name="msapplication-TileColor" content="#ffffff">
     <meta name="msapplication-TileImage" content="/mstile-144x144.png">
 
@@ -48,6 +48,9 @@
 
     <script type="text/javascript">
         $.fn.select2.defaults.set("theme", "bootstrap");
+        {% if request.user.is_authenticated %}
+        window.ACTIVE_SPACE_ID = '{{request.space.id}}';
+        {% endif %}
     </script>
 
     <!-- Fontawesome icons -->
@@ -409,6 +412,7 @@
     localStorage.setItem('STATIC_URL', "{% base_path request 'static_base' %}")
     localStorage.setItem('DEBUG', "{% is_debug %}")
     localStorage.setItem('USER_ID', "{{request.user.pk}}")
+    
     window.addEventListener("load", () => {
         if ("serviceWorker" in navigator) {
             navigator.serviceWorker.register("{% url 'service_worker' %}", {scope: "{% base_path request 'base' %}" + '/'}).then(function (reg) {

cookbook/templates/test.html

@@ -16,5 +16,16 @@
 
 
 {% block script %}
+    {% if debug %}
+        <script src="{% url 'js_reverse' %}"></script>
+    {% else %}
+        <script src="{% static 'django_js_reverse/reverse.js' %}"></script>
+    {% endif %}
 
+    <script type="application/javascript">
+
+        window.CUSTOM_LOCALE = '{{ request.LANGUAGE_CODE }}'
+    </script>
+
+    {% render_bundle 'test_view' %}
 {% endblock %}

cookbook/templatetags/custom_tags.py

@@ -101,6 +101,7 @@ def page_help(page_name):
         'view_shopping': 'https://docs.tandoor.dev/features/shopping/',
         'view_import': 'https://docs.tandoor.dev/features/import_export/',
         'view_export': 'https://docs.tandoor.dev/features/import_export/',
+        'list_automation': 'https://docs.tandoor.dev/features/automation/',
     }
 
     link = help_pages.get(page_name, '')

cookbook/tests/api/test_api_share_link.py

@@ -0,0 +1,22 @@
+import json
+
+from django.urls import reverse
+from django_scopes import scopes_disabled
+
+from cookbook.helper.permission_helper import share_link_valid
+from cookbook.models import Recipe
+
+
+def test_get_share_link(recipe_1_s1, u1_s1, u1_s2, g1_s1, a_u, space_1):
+    assert u1_s1.get(reverse('api_share_link', args=[recipe_1_s1.pk])).status_code == 200
+    assert u1_s2.get(reverse('api_share_link', args=[recipe_1_s1.pk])).status_code == 404
+    assert g1_s1.get(reverse('api_share_link', args=[recipe_1_s1.pk])).status_code == 403
+    assert a_u.get(reverse('api_share_link', args=[recipe_1_s1.pk])).status_code == 403
+
+    with scopes_disabled():
+        sl = json.loads(u1_s1.get(reverse('api_share_link', args=[recipe_1_s1.pk])).content)
+        assert share_link_valid(Recipe.objects.filter(pk=sl['pk']).get(), sl['share'])
+
+        space_1.allow_sharing = False
+        space_1.save()
+        assert u1_s1.get(reverse('api_share_link', args=[recipe_1_s1.pk])).status_code == 403

cookbook/tests/factories/__init__.py

@@ -97,7 +97,8 @@ class SupermarketCategoryFactory(factory.django.DjangoModelFactory):
 @register
 class FoodFactory(factory.django.DjangoModelFactory):
     """Food factory."""
-    name = factory.LazyAttribute(lambda x: faker.sentence(nb_words=3, variable_nb_words=False))
+    name = factory.LazyAttribute(lambda x: faker.sentence(nb_words=10)[:128])
+    plural_name = factory.LazyAttribute(lambda x: faker.sentence(nb_words=3, variable_nb_words=False))
     description = factory.LazyAttribute(lambda x: faker.sentence(nb_words=10))
     supermarket_category = factory.Maybe(
         factory.LazyAttribute(lambda x:  x.has_category),
@@ -126,7 +127,7 @@ class FoodFactory(factory.django.DjangoModelFactory):
 
     class Meta:
         model = 'cookbook.Food'
-        django_get_or_create = ('name', 'space',)
+        django_get_or_create = ('name', 'plural_name', 'space',)
 
 
 @register
@@ -159,13 +160,14 @@ class RecipeBookEntryFactory(factory.django.DjangoModelFactory):
 @register
 class UnitFactory(factory.django.DjangoModelFactory):
     """Unit factory."""
-    name = factory.LazyAttribute(lambda x: faker.word())
+    name = factory.LazyAttribute(lambda x: faker.sentence(nb_words=10)[:128])
+    plural_name = factory.LazyAttribute(lambda x: faker.word())
     description = factory.LazyAttribute(lambda x: faker.sentence(nb_words=10))
     space = factory.SubFactory(SpaceFactory)
 
     class Meta:
         model = 'cookbook.Unit'
-        django_get_or_create = ('name', 'space',)
+        django_get_or_create = ('name', 'plural_name', 'space',)
 
 
 @register

cookbook/tests/other/test_automations.py

@@ -0,0 +1,50 @@
+import pytest
+from django.contrib import auth
+from django.urls import reverse
+from django_scopes import scopes_disabled
+
+from cookbook.forms import ImportExportBase
+from cookbook.helper.ingredient_parser import IngredientParser
+from cookbook.models import ExportLog, Automation
+import json
+import os
+
+import pytest
+from django.urls import reverse
+
+from cookbook.tests.conftest import validate_recipe
+
+IMPORT_SOURCE_URL = 'api_recipe_from_source'
+
+
+# for some reason this tests cant run due to some kind of encoding issue, needs to be fixed
+# def test_description_replace_automation(u1_s1, space_1):
+#     if 'cookbook' in os.getcwd():
+#         test_file = os.path.join(os.getcwd(), 'other', 'test_data', 'chefkoch2.html')
+#     else:
+#         test_file = os.path.join(os.getcwd(), 'cookbook', 'tests', 'other', 'test_data', 'chefkoch2.html')
+#
+#     # original description
+#     # Brokkoli - Bratlinge. Über 91 Bewertungen und für vorzüglich befunden. Mit ► Portionsrechner ► Kochbuch ► Video-Tipps! Jetzt entdecken und ausprobieren!
+#
+#     with scopes_disabled():
+#         Automation.objects.create(
+#             name='test1',
+#             created_by=auth.get_user(u1_s1),
+#             space=space_1,
+#             param_1='.*',
+#             param_2='.*',
+#             param_3='',
+#             order=1000,
+#         )
+#
+#     with open(test_file, 'r', encoding='UTF-8') as d:
+#         response = u1_s1.post(
+#             reverse(IMPORT_SOURCE_URL),
+#             {
+#                 'data': d.read(),
+#                 'url': 'https://www.chefkoch.de/rezepte/804871184310070/Brokkoli-Bratlinge.html',
+#             },
+#             content_type='application/json')
+#         recipe = json.loads(response.content)['recipe_json']
+#         assert recipe['description'] == ''

cookbook/tests/other/test_ingredient_parser.py

@@ -54,7 +54,7 @@ def test_ingredient_parser():
         "3,5 l Wasser": (3.5, "l", "Wasser", ""),
         "3.5 l Wasser": (3.5, "l", "Wasser", ""),
         "400 g Karotte(n)": (400, "g", "Karotte(n)", ""),
-        "400g unsalted butter": (400, "g", "butter", "unsalted"),
+        "400g unsalted butter": (400, "g", "unsalted butter", ""),
         "2L Wasser": (2, "L", "Wasser", ""),
         "1 (16 ounce) package dry lentils, rinsed": (1, "package", "dry lentils, rinsed", "16 ounce"),
         "2-3 c Water": (2, "c", "Water", "2-3"),
@@ -75,6 +75,8 @@ def test_ingredient_parser():
     # an amount # and it starts with a lowercase letter, then that
     # is a unit ("etwas", "evtl.") does not apply to English tho
 
+    # TODO maybe add/improve support for weired stuff like this https://www.rainbownourishments.com/vegan-lemon-tart/#recipe
+
     ingredient_parser = IngredientParser(None, False, ignore_automations=True)
 
     count = 0

cookbook/tests/other/test_url_import.py

@@ -2,13 +2,16 @@ import json
 import os
 
 import pytest
+from django.contrib import auth
 from django.urls import reverse
+from django_scopes import scopes_disabled
 
 from cookbook.tests.conftest import validate_recipe
 
 from ._recipes import (ALLRECIPES, AMERICAS_TEST_KITCHEN, CHEF_KOCH, CHEF_KOCH2, COOKPAD,
                        COOKS_COUNTRY, DELISH, FOOD_NETWORK, GIALLOZAFFERANO, JOURNAL_DES_FEMMES,
                        MADAME_DESSERT, MARMITON, TASTE_OF_HOME, THE_SPRUCE_EATS, TUDOGOSTOSO)
+from ...models import Automation
 
 IMPORT_SOURCE_URL = 'api_recipe_from_source'
 DATA_DIR = "cookbook/tests/other/test_data/"
@@ -72,3 +75,5 @@ def test_recipe_import(arg, u1_s1):
                 content_type='application/json')
         recipe = json.loads(response.content)['recipe_json']
         validate_recipe(arg, recipe)
+
+

cookbook/views/api.py

@@ -170,7 +170,7 @@ class FuzzyFilterMixin(ViewSetMixin, ExtendedRecipeMixin):
                                                                       'field', flat=True)])
 
         if query is not None and query not in ["''", '']:
-            if fuzzy:
+            if fuzzy and (settings.DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2', 'django.db.backends.postgresql']):
                 if any([self.model.__name__.lower() in x for x in
                         self.request.user.searchpreference.unaccent.values_list('field', flat=True)]):
                     self.queryset = self.queryset.annotate(trigram=TrigramSimilarity('name__unaccent', query))
@@ -852,7 +852,7 @@ class RecipeViewSet(viewsets.ModelViewSet):
 
             if image is not None:
                 img = handle_image(request, image, filetype)
-                obj.image = File(img, name=f'{uuid.uuid4()}_{obj.pk}{filetype}')
+                obj.image.save(f'{uuid.uuid4()}_{obj.pk}{filetype}', img)
                 obj.save()
                 return Response(serializer.data)
             else:
@@ -1116,16 +1116,17 @@ class CustomAuthToken(ObtainAuthToken):
                                            context={'request': request})
         serializer.is_valid(raise_exception=True)
         user = serializer.validated_data['user']
-        if token := AccessToken.objects.filter(scope__contains='read').filter(scope__contains='write').first():
+        if token := AccessToken.objects.filter(user=user, expires__gt=timezone.now(), scope__contains='read').filter(scope__contains='write').first():
             access_token = token
         else:
-            access_token = AccessToken.objects.create(user=request.user, token=f'tda_{str(uuid.uuid4()).replace("-", "_")}', expires=(timezone.now() + timezone.timedelta(days=365 * 5)), scope='read write app')
+            access_token = AccessToken.objects.create(user=user, token=f'tda_{str(uuid.uuid4()).replace("-", "_")}', expires=(timezone.now() + timezone.timedelta(days=365 * 5)), scope='read write app')
         return Response({
             'id': access_token.id,
             'token': access_token.token,
             'scope': access_token.scope,
             'expires': access_token.expires,
-            'user_id': user.pk,
+            'user_id': access_token.user.pk,
+            'test': user.pk
         })
 
 
@@ -1305,6 +1306,8 @@ def import_files(request):
             return Response({'import_id': il.pk}, status=status.HTTP_200_OK)
         except NotImplementedError:
             return Response({'error': True, 'msg': _('Importing is not implemented for this provider')}, status=status.HTTP_400_BAD_REQUEST)
+    else:
+        return Response({'error': True, 'msg': form.errors}, status=status.HTTP_400_BAD_REQUEST)
 
 
 def get_recipe_provider(recipe):
@@ -1381,13 +1384,16 @@ def sync_all(request):
 
 
 def share_link(request, pk):
-    if request.space.allow_sharing and has_group_permission(request.user, 'user'):
-        recipe = get_object_or_404(Recipe, pk=pk, space=request.space)
-        link = ShareLink.objects.create(recipe=recipe, created_by=request.user, space=request.space)
-        return JsonResponse({'pk': pk, 'share': link.uuid,
-                             'link': request.build_absolute_uri(reverse('view_recipe', args=[pk, link.uuid]))})
-    else:
-        return JsonResponse({'error': 'sharing_disabled'}, status=403)
+    if request.user.is_authenticated:
+        if request.space.allow_sharing and has_group_permission(request.user, ('user',)):
+            recipe = get_object_or_404(Recipe, pk=pk, space=request.space)
+            link = ShareLink.objects.create(recipe=recipe, created_by=request.user, space=request.space)
+            return JsonResponse({'pk': pk, 'share': link.uuid,
+                                 'link': request.build_absolute_uri(reverse('view_recipe', args=[pk, link.uuid]))})
+        else:
+            return JsonResponse({'error': 'sharing_disabled'}, status=403)
+
+    return JsonResponse({'error': 'not_authenticated'}, status=403)
 
 
 @group_required('user')

cookbook/views/import_export.py

@@ -31,6 +31,7 @@ from cookbook.integration.plantoeat import Plantoeat
 from cookbook.integration.recettetek import RecetteTek
 from cookbook.integration.recipekeeper import RecipeKeeper
 from cookbook.integration.recipesage import RecipeSage
+from cookbook.integration.rezeptsuitede import Rezeptsuitede
 from cookbook.integration.rezkonv import RezKonv
 from cookbook.integration.saffron import Saffron
 from cookbook.models import ExportLog, ImportLog, Recipe, UserPreference
@@ -80,6 +81,8 @@ def get_integration(request, export_type):
         return MelaRecipes(request, export_type)
     if export_type == ImportExportBase.COOKMATE:
         return Cookmate(request, export_type)
+    if export_type == ImportExportBase.REZEPTSUITEDE:
+        return Rezeptsuitede(request, export_type)
 
 
 @group_required('user')

cookbook/views/views.py

@@ -438,7 +438,7 @@ def test(request):
     parser = IngredientParser(request, False)
 
     data = {
-        'original': '1 Porreestange(n) , ca. 200 g'
+        'original': '90g golden syrup'
     }
     data['parsed'] = parser.parse(data['original'])
 

docs/contribute.md

@@ -11,8 +11,13 @@ over at [GitHub issues](https://github.com/vabene1111/recipes/issues).
 Without feedback improvement can't happen, so don't hesitate to say what you want to say.
 
 ## Contributing Code
-Code contributions are always welcome. There are no special rules for what you need to do, 
-just do your best and we will work together to get your idea and code merged into the project.
+If you want to contribute bug fixes or small tweaks then your pull requests are always welcome!
+
+!!! danger "Discuss First!"
+    If you want to contribute larger features that introduce more complexity to the project please
+    make sure to **first submit a technical description** outlining what and how you want to do it. 
+    This allows me and the community to give feedback and manage the complexity of the overall 
+    application. If you don't do this please don't be mad if I reject your PR
 
 !!! info
     The dev setup is a little messy as this application combines the best (at least in my opinion) of both Django and Vue.js.
@@ -36,7 +41,7 @@ Most new frontend pages are build using [Vue.js](https://vuejs.org/).
 
 In order to work on these pages, you will have to install a Javascript package manager of your choice. The following examples use yarn.
 
-Run `yarn install` to install the dependencies. After that you can use `yarn serve` to start the development server,
+In the `vue` folder run `yarn install` to install the dependencies. After that you can use `yarn serve` to start the development server,
 and proceed to test your changes. If you do not wish to work on those pages, but instead want the application to work properly during 
 development, run `yarn build` to build the frontend pages once. 
 

docs/faq.md

@@ -48,16 +48,25 @@ The other common issue is that the recommended nginx container is removed from t
 If removed, the nginx webserver needs to be replaced by something else that servers the /mediafiles/ directory or 
 `GUNICORN_MEDIA` needs to be enabled to allow media serving by the application container itself.
 
+
+## Why does the Text/Markdown preview look different than the final recipe?
+
+Tandoor has always rendered the recipe instructions markdown on the server. This also allows tandoor to implement things like ingredient templating and scaling in text.
+To make editing easier a markdown editor was added to the frontend with integrated preview as a temporary solution. Since the markdown editor uses a different 
+specification than the server the preview is different to the final result. It is planned to improve this in the future. 
+
+The markdown renderer follows this markdown specification https://daringfireball.net/projects/markdown/
+
 ## Why is Tandoor not working on my Raspberry Pi?
 
 Please refer to [here](install/docker.md#setup-issues-on-raspberry-pi).
 
 ## How can I create users?
-To create a new user click on your name (top right corner) and select system. There click on invite links and create a new invite link.
+To create a new user click on your name (top right corner) and select 'space settings'. There under invites click create.
 
 It is not possible to create users through the admin because users must be assigned a default group and space.
 
-To change a users space you need to go to the admin and select User Infos. 
+To change a user's space you need to go to the admin and select User Infos. 
 
 If you use an external auth provider or proxy authentication make sure to specify a default group and space in the 
 environment configuration.
@@ -69,7 +78,7 @@ In technical terms it is a multi tenant system.
 You can compare a space to something like google drive or dropbox. 
 There is only one installation of the Dropbox system, but it handles multiple users without them noticing each other.
 For Tandoor that means all people that work together on one recipe collection can be in one space. 
-If you want to host the collection of your friends family or your neighbor you can create a separate space for them (through the admin interface).
+If you want to host the collection of your friends, family, or neighbor you can create a separate space for them (through the admin interface).
 
 Sharing between spaces is currently not possible but is planned for future releases.
 

docs/features/automation.md

@@ -0,0 +1,64 @@
+!!! warning
+    Automations are currently in a beta stage. They work pretty stable but if I encounter any 
+    issues while working on them, I might change how they work breaking existing automations.
+    I will try to avoid this and am pretty confident it won't happen.
+
+
+Automations allow Tandoor to automatically perform certain tasks, especially when importing recipes, that 
+would otherwise have to be done manually. Currently, the following automations are supported.
+
+## Unit, Food, Keyword Alias
+Foods, Units and Keywords can have automations that automatically replace them with another object
+to allow aliasing them. 
+
+This helps to add consistency to the naming of objects, for example to always use the singular form
+for the main name if a plural form is configured. 
+
+These automations are best created by dragging and dropping Foods, Units or Keywords in their respective 
+views and creating the automation there. 
+
+You can also create them manually by setting the following
+- **Parameter 1**: name of food/unit/keyword to match
+- **Parameter 2**: name of food/unit/keyword to replace matched food with
+
+These rules are processed whenever you are importing recipes from websites or other apps
+and when using the simple ingredient input (shopping, recipe editor, ...).
+
+## Description Replace
+This automation is a bit more complicated than the alis rules. It is run when importing a recipe
+from a website.
+
+It uses Regular Expressions (RegEx) to determine if a description should be altered, what exactly to remove
+and what to replace it with. 
+
+- **Parameter 1**: pattern of which sites to match (e.g. `.*.chefkoch.de.*`, `.*`)
+- **Parameter 2**: pattern of what to replace (e.g. `.*`)
+- **Parameter 3**: value to replace matched occurrence of parameter 2 with. Only one occurrence of the pattern is replaced.
+
+To replace the description the python [re.sub](https://docs.python.org/2/library/re.html#re.sub) function is used
+like this `re.sub(<parameter 2>, <parameter 2>, <descriotion>, count=1)`
+
+To test out your patterns and learn about RegEx you can use [regexr.com](https://regexr.com/)
+
+!!! info
+    In order to prevent denial of service attacks on the RegEx engine the number of replace automations 
+    and the length of the inputs that are processed are limited. Those limits should never be reached
+    during normal usage. 
+
+## Instruction Replace
+This works just like the Description Replace automation but runs against all instruction texts
+in all steps of a recipe during import. 
+
+Also instead of just replacing a single occurrence of the matched pattern it will replace all.
+
+# Order
+If the Automation type allows for more than one rule to be executed (for example description replace) 
+the rules are processed in ascending order (ordered by the *order* property of the automation). 
+The default order is always 1000 to make it easier to add automations before and after other automations. 
+
+Example:
+1. Rule ABC (order 1000) replaces `everything` with `abc`
+2. Rule DEF (order 2000) replaces `everything` with `def`
+3. Rule XYZ (order 500) replaces `everything` with `xyz`
+
+After processing rules XYZ, then ABC and then DEF the description will have the value `def`

docs/features/import_export.md

@@ -1,7 +1,7 @@
 This application features a very versatile import and export feature in order 
 to offer the best experience possible and allow you to freely choose where your data goes.
 
-!!! warning "WIP"
+!!! WARNING "WIP"
     The Module is relatively new. There is a known issue with [Timeouts](https://github.com/vabene1111/recipes/issues/417) on large exports.
     A fix is being developed and will likely be released with the next version.
 
@@ -13,7 +13,7 @@ if your favorite one is missing.
 
 !!! info "Export"
     I strongly believe in everyone's right to use their data as they please and therefore want to give you 
-    the most possible flexibility with your recipes.
+    the best possible flexibility with your recipes.
     That said for most of the people getting this application running with their recipes is the biggest priority.
     Because of this importing as many formats as possible is prioritized over exporting.
     Exporter for the different formats will follow over time.
@@ -75,7 +75,7 @@ Follow these steps to import your recipes
 
 You will get a `Recipes.zip` file. Simply upload the file and choose the Nextcloud Cookbook type.
 
-!!! warning "Folder Structure"
+!!! WARNING "Folder Structure"
     Importing only works if the folder structure is correct. If you do not use the standard path or create the 
     zip file in any other way make sure the structure is as follows
     ```
@@ -94,9 +94,9 @@ Mealie provides structured data similar to nextcloud.
 
 To migrate your recipes 
 
-1. Go to your Mealie settings and create a new Backup
-2. Download the backup by clicking on it and pressing download (this wasn't working for me, so I had to manually pull it from the server)
-3. Upload the entire `.zip` file to the importer page and import everything
+1. Go to your Mealie settings and create a new Backup.
+2. Download the backup by clicking on it and pressing download (this wasn't working for me, so I had to manually pull it from the server).
+3. Upload the entire `.zip` file to the importer page and import everything.
 
 ## Chowdown
 Chowdown stores all your recipes in plain text markdown files in a directory called `_recipes`. 
@@ -158,7 +158,7 @@ As ChefTap cannot import these files anyway there won't be an exporter implement
 Meal master can be imported by uploading one or more meal master files. 
 The files should either be `.txt`, `.MMF` or `.MM` files. 
 
-The MealMaster spec allow for many variations. Currently, only the one column format for ingredients is supported.
+The MealMaster spec allows for many variations. Currently, only the one column format for ingredients is supported.
 Second line notes to ingredients are currently also not imported as a note but simply put into the instructions.
 If you have MealMaster recipes that cannot be imported feel free to raise an issue.
 
@@ -248,4 +248,4 @@ For that to work it downloads a chromium binary of about 140 MB to your server a
 Since that is something some server administrators might not want there the PDF exporter is disabled by default and can be enabled with `ENABLE_PDF_EXPORT=1` in `.env`.
 
 See [this issue](https://github.com/TandoorRecipes/recipes/pull/1211) for more discussion on this and 
-[this issue](https://github.com/TandoorRecipes/recipes/issues/781) for the future plans to support server side rendering.
+[this issue](https://github.com/TandoorRecipes/recipes/issues/781) for the future plans to support server side rendering.

docs/install/manual.md

@@ -180,11 +180,11 @@ server {
     #error_log /var/log/nginx/error.log;
 
     # serve media files
-    location /static {
+    location /static/ {
         alias /var/www/recipes/staticfiles;
     }
     
-    location /media {
+    location /media/ {
         alias /var/www/recipes/mediafiles;
     }
 
@@ -210,9 +210,12 @@ cd /var/www/recipes
 git pull
 # load envirtonment variables
 export $(cat /var/www/recipes/.env |grep "^[^#]" | xargs)
+#install project requirements
+bin/pip3 install -r requirements.txt
 # migrate database 
 bin/python3 manage.py migrate
 # collect static files
+# if the output is not "0 static files copied" you might want to run the commands again to make sure everythig is collected
 bin/python3 manage.py collectstatic --no-input
 bin/python3 manage.py collectstatic_js_reverse
 # change to frontend directory

docs/install/other.md

@@ -61,4 +61,4 @@ I left out the TLS config in this example for simplicity.
 
 ## WSL
 
-If you want to install Tandoor on the Windows Subsystem for Linux you can find a detailed post herre https://github.com/TandoorRecipes/recipes/issues/1733
+If you want to install Tandoor on the Windows Subsystem for Linux you can find a detailed post here: <https://github.com/TandoorRecipes/recipes/issues/1733>.

docs/system/settings.md

@@ -0,0 +1,27 @@
+Following is a description of the different settings for a space
+
+!!! WARNING WIP
+    Some settings and especially this page is work in Progress and the settings may
+    behave differently the described here.
+
+## Use Plural form
+
+Default Value: `off`
+
+This setting enables tandoor to display a plural form of a food or unit, if the
+plural version is entered for the food or unit. The plural version is displayed if the
+amount needed for a recipe is greater than 1 and will be adjusted to the current amount.
+
+In addition, this setting enables two new settings for an ingredient:
+
+- Always show the plural version of the food: This will always display the plural version for
+a food, even if the amount is below or equal to 1. Requirement for this setting to activate
+is a plural version available in the database.
+- Always show the plural version of the unit: This will always display the plural version for
+a unit, even if the amount is below or equal to 1. Requirement for this setting to activate
+is a plural version available in the database.
+
+!!! WARNING Note
+    This setting is only meant to be a very simple version to enable some kind of pluralization
+    for food and units. This feature may not meet your needs, but pluralization is a difficult
+    topic and was discussed [here](https://github.com/TandoorRecipes/recipes/pull/1860).

mkdocs.yml

@@ -23,6 +23,7 @@ markdown_extensions:
 
 plugins:
   - include-markdown
+  - search
 
 nav:
   - Home: 'index.md'

node_modules/.yarn-integrity

@@ -0,0 +1,12 @@
+{
+  "systemParams": "win32-x64-93",
+  "modulesFolders": [
+    "node_modules"
+  ],
+  "flags": [],
+  "linkedModules": [],
+  "topLevelPatterns": [],
+  "lockfileEntries": {},
+  "files": [],
+  "artifacts": {}
+}

openapitools.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json",
+  "spaces": 2,
+  "generator-cli": {
+    "version": "6.2.1"
+  }
+}

recipes/locale/ca/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-07-12 19:20+0200\n"
+"POT-Creation-Date: 2023-01-19 19:14+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,62 +18,62 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\recipes\settings.py:369
+#: .\recipes\settings.py:382
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:370
+#: .\recipes\settings.py:383
 msgid "Bulgarian"
 msgstr ""
 
-#: .\recipes\settings.py:371
+#: .\recipes\settings.py:384
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:372
+#: .\recipes\settings.py:385
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:373
+#: .\recipes\settings.py:386
 msgid "Danish"
 msgstr ""
 
-#: .\recipes\settings.py:374
+#: .\recipes\settings.py:387
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:375
+#: .\recipes\settings.py:388
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:376
+#: .\recipes\settings.py:389
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:377
+#: .\recipes\settings.py:390
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:378
+#: .\recipes\settings.py:391
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:379
+#: .\recipes\settings.py:392
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:380
+#: .\recipes\settings.py:393
 msgid "Polish"
 msgstr ""
 
-#: .\recipes\settings.py:381
+#: .\recipes\settings.py:394
 msgid "Russian"
 msgstr ""
 
-#: .\recipes\settings.py:382
+#: .\recipes\settings.py:395
 msgid "Spanish"
 msgstr ""
 
-#: .\recipes\settings.py:383
+#: .\recipes\settings.py:396
 msgid "Swedish"
 msgstr ""

recipes/locale/de/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-07-12 19:20+0200\n"
+"POT-Creation-Date: 2023-01-19 19:14+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,64 +18,64 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\recipes\settings.py:369
+#: .\recipes\settings.py:382
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:370
+#: .\recipes\settings.py:383
 msgid "Bulgarian"
 msgstr ""
 
-#: .\recipes\settings.py:371
+#: .\recipes\settings.py:384
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:372
+#: .\recipes\settings.py:385
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:373
+#: .\recipes\settings.py:386
 msgid "Danish"
 msgstr ""
 
-#: .\recipes\settings.py:374
+#: .\recipes\settings.py:387
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:375
+#: .\recipes\settings.py:388
 msgid "English"
 msgstr "Englisch"
 
-#: .\recipes\settings.py:376
+#: .\recipes\settings.py:389
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:377
+#: .\recipes\settings.py:390
 msgid "German"
 msgstr "Deutsch"
 
-#: .\recipes\settings.py:378
+#: .\recipes\settings.py:391
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:379
+#: .\recipes\settings.py:392
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:380
+#: .\recipes\settings.py:393
 #, fuzzy
 #| msgid "English"
 msgid "Polish"
 msgstr "Englisch"
 
-#: .\recipes\settings.py:381
+#: .\recipes\settings.py:394
 msgid "Russian"
 msgstr ""
 
-#: .\recipes\settings.py:382
+#: .\recipes\settings.py:395
 msgid "Spanish"
 msgstr ""
 
-#: .\recipes\settings.py:383
+#: .\recipes\settings.py:396
 msgid "Swedish"
 msgstr ""

recipes/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-07-12 19:20+0200\n"
+"POT-Creation-Date: 2023-01-19 19:14+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,62 +18,62 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: .\recipes\settings.py:369
+#: .\recipes\settings.py:382
 msgid "Armenian "
 msgstr ""
 
-#: .\recipes\settings.py:370
+#: .\recipes\settings.py:383
 msgid "Bulgarian"
 msgstr ""
 
-#: .\recipes\settings.py:371
+#: .\recipes\settings.py:384
 msgid "Catalan"
 msgstr ""
 
-#: .\recipes\settings.py:372
+#: .\recipes\settings.py:385
 msgid "Czech"
 msgstr ""
 
-#: .\recipes\settings.py:373
+#: .\recipes\settings.py:386
 msgid "Danish"
 msgstr ""
 
-#: .\recipes\settings.py:374
+#: .\recipes\settings.py:387
 msgid "Dutch"
 msgstr ""
 
-#: .\recipes\settings.py:375
+#: .\recipes\settings.py:388
 msgid "English"
 msgstr ""
 
-#: .\recipes\settings.py:376
+#: .\recipes\settings.py:389
 msgid "French"
 msgstr ""
 
-#: .\recipes\settings.py:377
+#: .\recipes\settings.py:390
 msgid "German"
 msgstr ""
 
-#: .\recipes\settings.py:378
+#: .\recipes\settings.py:391
 msgid "Italian"
 msgstr ""
 
-#: .\recipes\settings.py:379
+#: .\recipes\settings.py:392
 msgid "Latvian"
 msgstr ""
 
-#: .\recipes\settings.py:380
+#: .\recipes\settings.py:393
 msgid "Polish"
 msgstr ""
 
-#: .\recipes\settings.py:381
+#: .\recipes\settings.py:394
 msgid "Russian"
 msgstr ""
 
-#: .\recipes\settings.py:382
+#: .\recipes\settings.py:395
 msgid "Spanish"
 msgstr ""
 
-#: .\recipes\settings.py:383
+#: .\recipes\settings.py:396
 msgid "Swedish"
 msgstr ""