added libgcc libstdc++ as dev dependency for arm builds?!

feat: introduce STATIC_ROOT env var

.devcontainer/devcontainer.json

@@ -20,6 +20,10 @@
 				"ms-python.python"
 			]
 		}
+	},
+
+	"containerEnv": {
+		"CSRF_TRUSTED_ORIGINS": "http://localhost:8000,http://localhost:8080"
 	}
 
 	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.

.env.template

@@ -6,6 +6,9 @@
 # random secret key, use for example `base64 /dev/urandom | head -c50` to generate one
 SECRET_KEY=
 
+# your default timezone See https://timezonedb.com/time-zones for a list of timezones
+TZ=Europe/Berlin
+
 # allowed hosts (see documentation), should be set to your hostname(s) but might be * (default) for some proxies/providers
 # ALLOWED_HOSTS=recipes.mydomain.com
 

.github/workflows/build-docker-open-data.yml

@@ -1,110 +0,0 @@
-name: Build Docker Container with open data plugin installed
-
-on: push
-
-jobs:
-  build-container:
-    name: Build ${{ matrix.name }} Container
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'TandoorRecipes'
-    continue-on-error: ${{ matrix.continue-on-error }}
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      matrix:
-        include:
-          # Standard build config
-          - name: Standard
-            dockerfile: Dockerfile
-            platforms: linux/amd64,linux/arm64
-            suffix: ""
-            continue-on-error: false
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Get version number
-        id: get_version
-        run: |
-          if [[ "$GITHUB_REF" = refs/tags/* ]]; then
-            echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
-          elif [[ "$GITHUB_REF" = refs/heads/beta ]]; then
-            echo VERSION=beta >> $GITHUB_OUTPUT
-          else
-            echo VERSION=develop >> $GITHUB_OUTPUT
-          fi
-
-      # clone open data plugin
-      - name: clone open data plugin repo
-        uses: actions/checkout@master
-        with:
-          repository: TandoorRecipes/open_data_plugin
-          ref: master
-          path: ./recipes/plugins/open_data_plugin
-
-      # Build Vue frontend
-      - uses: actions/setup-node@v4
-        with:
-          node-version: '18'
-          cache: yarn
-          cache-dependency-path: vue/yarn.lock
-      - name: Install dependencies
-        working-directory: ./vue
-        run: yarn install --frozen-lockfile
-      - name: Build dependencies
-        working-directory: ./vue
-        run: yarn build
-
-      - name: Setup Open Data Plugin Links
-        working-directory: ./recipes/plugins/open_data_plugin
-        run: python setup_repo.py
-        
-      - name: Build Open Data Frontend
-        working-directory: ./recipes/plugins/open_data_plugin/vue
-        run: yarn build
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        if: github.secret_source == 'Actions'
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        if: github.secret_source == 'Actions'
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ github.token }}
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            vabene1111/recipes
-            ghcr.io/TandoorRecipes/recipes
-          flavor: |
-            latest=false
-            suffix=${{ matrix.suffix }}
-          tags: |
-            type=raw,value=latest,suffix=-open-data-plugin,enable=${{ startsWith(github.ref, 'refs/tags/') }}
-            type=semver,suffix=-open-data-plugin,pattern={{version}}
-            type=semver,suffix=-open-data-plugin,pattern={{major}}.{{minor}}
-            type=semver,suffix=-open-data-plugin,pattern={{major}}
-            type=ref,suffix=-open-data-plugin,event=branch
-      - name: Build and Push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ${{ matrix.dockerfile }}
-          pull: true
-          push: ${{ github.secret_source == 'Actions' }}
-          platforms: ${{ matrix.platforms }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max

.github/workflows/build-docker.yml

@@ -17,7 +17,7 @@ jobs:
           # Standard build config
           - name: Standard
             dockerfile: Dockerfile
-            platforms: linux/amd64,linux/arm64,linux/arm/v7
+            platforms: linux/amd64,linux/arm64
             suffix: ""
             continue-on-error: false
     steps:
@@ -34,17 +34,17 @@ jobs:
             echo VERSION=develop >> $GITHUB_OUTPUT
           fi
 
-      # Build Vue frontend
+      # Build Vue 3 frontend
       - uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '22'
           cache: yarn
-          cache-dependency-path: vue/yarn.lock
+          cache-dependency-path: vue3/yarn.lock
       - name: Install dependencies
-        working-directory: ./vue
+        working-directory: ./vue3
         run: yarn install --frozen-lockfile
       - name: Build dependencies
-        working-directory: ./vue
+        working-directory: ./vue3
         run: yarn build
 
       - name: Set up QEMU
@@ -74,8 +74,9 @@ jobs:
           flavor: |
             latest=false
             suffix=${{ matrix.suffix }}
+          # disable latest for tagged releases while in beta
+          # type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/') }}
           tags: |
-            type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/') }}
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
@@ -93,29 +94,29 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-  notify-stable:
-    name: Notify Stable
-    runs-on: ubuntu-latest
-    needs: build-container
-    if: startsWith(github.ref, 'refs/tags/')
-    steps:
-      - name: Set tag name
-        run: |
-          # Strip "refs/tags/" prefix
-          echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
-      # Send stable discord notification
-      - name: Discord notification
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_RELEASE_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.3.2
-        with:
-          args: '🚀 Version {{ VERSION }} of tandoor has been released 🥳 Check it out https://github.com/vabene1111/recipes/releases/tag/{{ VERSION }}'
+#  notify-stable:
+#    name: Notify Stable
+#    runs-on: ubuntu-latest
+#    needs: build-container
+#    if: startsWith(github.ref, 'refs/tags/')
+#    steps:
+#      - name: Set tag name
+#        run: |
+#          # Strip "refs/tags/" prefix
+#          echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+#      # Send stable discord notification
+#      - name: Discord notification
+#        env:
+#          DISCORD_WEBHOOK: ${{ secrets.DISCORD_RELEASE_WEBHOOK }}
+#        uses: Ilshidur/action-discord@0.3.2
+#        with:
+#          args: '🚀 Version {{ VERSION }} of tandoor has been released 🥳 Check it out https://github.com/vabene1111/recipes/releases/tag/{{ VERSION }}'
 
   notify-beta:
     name: Notify Beta
     runs-on: ubuntu-latest
     needs: build-container
-    if: github.ref == 'refs/heads/beta'
+    if: startsWith(github.ref, 'refs/tags/')
     steps:
       # Send beta discord notification
       - name: Discord notification
@@ -123,4 +124,4 @@ jobs:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_BETA_WEBHOOK }}
         uses: Ilshidur/action-discord@0.3.2
         with:
-          args: '🚀 The BETA Image has been updated! 🥳'
+          args: '🚀 The Tandoor 2 Image has been updated! 🥳'

.github/workflows/ci.yml

@@ -11,12 +11,11 @@ jobs:
             matrix:
                 python-version: ["3.10"]
                 node-version: ["18"]
-
         steps:
             - uses: actions/checkout@v4
-            - uses: awalsh128/cache-apt-pkgs-action@v1.4.2
+            - uses: awalsh128/cache-apt-pkgs-action@v1.4.3
               with:
-                  packages: libsasl2-dev python3-dev libldap2-dev libssl-dev
+                  packages: libsasl2-dev python3-dev libxml2-dev libxmlsec1-dev libxslt-dev libxmlsec1-openssl libxslt-dev libldap2-dev libssl-dev gcc musl-dev postgresql-dev zlib-dev jpeg-dev libwebp-dev openssl-dev libffi-dev cargo openldap-dev python3-dev xmlsec-dev xmlsec build-base g++ curl
                   version: 1.0
 
             # Setup python & dependencies

.gitignore

@@ -75,8 +75,10 @@ cookbook/static/vue
 vue/webpack-stats.json
 /docker-compose.override.yml
 vue/node_modules
-plugins
-vue3/node_modules
+/recipes/plugins
+vetur.config.js
+cookbook/static/vue
+vue/webpack-stats.json
 cookbook/templates/sw.js
 vue/.yarn
 vue3/.vite
@@ -85,4 +87,5 @@ vue3/.vite
 vetur.config.js
 venv/
 .idea/easy-i18n.xml
-cookbook/static/vue3
+cookbook/static/vue3
+vue3/node_modules

.idea/prettier.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PrettierConfiguration">
+    <option name="myConfigurationMode" value="AUTOMATIC" />
+  </component>
+</project>

.idea/recipes.iml

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

.idea/watcherTasks.xml

@@ -5,7 +5,7 @@
       <option name="arguments" value="-m flake8 $FilePath$ --config $ContentRoot$\.flake8" />
       <option name="checkSyntaxErrors" value="true" />
       <option name="description" />
-      <option name="exitCodeBehavior" value="ALWAYS" />
+      <option name="exitCodeBehavior" value="NEVER" />
       <option name="fileExtension" value="py" />
       <option name="immediateSync" value="false" />
       <option name="name" value="Flake8 Watcher" />
@@ -27,5 +27,65 @@
       <option name="workingDir" value="" />
       <envs />
     </TaskOptions>
+    <TaskOptions isEnabled="false">
+      <option name="arguments" value="-m isort $FilePath$" />
+      <option name="checkSyntaxErrors" value="true" />
+      <option name="description" />
+      <option name="exitCodeBehavior" value="ERROR" />
+      <option name="fileExtension" value="py" />
+      <option name="immediateSync" value="false" />
+      <option name="name" value="isort Watcher" />
+      <option name="output" value="$FilePath$" />
+      <option name="outputFilters">
+        <array />
+      </option>
+      <option name="outputFromStdout" value="false" />
+      <option name="program" value="$PyInterpreterDirectory$/python" />
+      <option name="runOnExternalChanges" value="false" />
+      <option name="scopeName" value="Project Files" />
+      <option name="trackOnlyRoot" value="false" />
+      <option name="workingDir" value="" />
+      <envs />
+    </TaskOptions>
+    <TaskOptions isEnabled="false">
+      <option name="arguments" value="-m yapf -i $FilePath$" />
+      <option name="checkSyntaxErrors" value="true" />
+      <option name="description" />
+      <option name="exitCodeBehavior" value="NEVER" />
+      <option name="fileExtension" value="py" />
+      <option name="immediateSync" value="false" />
+      <option name="name" value="YAPF" />
+      <option name="output" value="$FilePath$" />
+      <option name="outputFilters">
+        <array />
+      </option>
+      <option name="outputFromStdout" value="false" />
+      <option name="program" value="$PyInterpreterDirectory$/python" />
+      <option name="runOnExternalChanges" value="false" />
+      <option name="scopeName" value="Project Files" />
+      <option name="trackOnlyRoot" value="false" />
+      <option name="workingDir" value="" />
+      <envs />
+    </TaskOptions>
+    <TaskOptions isEnabled="false">
+      <option name="arguments" value="--cwd $ProjectFileDir$\vue prettier -w --config $ProjectFileDir$\.prettierrc $FilePath$" />
+      <option name="checkSyntaxErrors" value="true" />
+      <option name="description" />
+      <option name="exitCodeBehavior" value="ERROR" />
+      <option name="fileExtension" value="*" />
+      <option name="immediateSync" value="true" />
+      <option name="name" value="Prettier" />
+      <option name="output" value="" />
+      <option name="outputFilters">
+        <array />
+      </option>
+      <option name="outputFromStdout" value="false" />
+      <option name="program" value="yarn" />
+      <option name="runOnExternalChanges" value="true" />
+      <option name="scopeName" value="Prettier" />
+      <option name="trackOnlyRoot" value="false" />
+      <option name="workingDir" value="" />
+      <envs />
+    </TaskOptions>
   </component>
 </project>

.vscode/launch.json

@@ -24,7 +24,7 @@
       "console": "integratedTerminal",
       "env": {
         // coverage and pytest can't both be running at the same time
-        "PYTEST_ADDOPTS": "--no-cov"
+        "PYTEST_ADDOPTS": "--no-cov -n 0"
       },
       "django": true,
       "justMyCode": true

.vscode/tasks.json

@@ -1,75 +1,131 @@
 {
-    "version": "2.0.0",
-    "tasks": [
-      {
-        "label": "Run Migrations",
-        "type": "shell",
-        "command": "python3 manage.py migrate",
-      },
-      {
-        "label": "Collect Static Files",
-        "type": "shell",
-        "command": "python3 manage.py collectstatic",
-        "dependsOn": ["Yarn Build"],
-      },
-      {
-        "label": "Setup Dev Server",
-        "dependsOn": ["Run Migrations", "Yarn Build"],
-      },
-      {
-        "label": "Run Dev Server",
-        "type": "shell",
-        "dependsOn": ["Setup Dev Server"],
-        "command": "python3 manage.py runserver",
-      },
-      {
-        "label": "Yarn Install",
-        "type": "shell",
-        "command": "yarn install",
-        "options": {
-          "cwd": "${workspaceFolder}/vue"
-        }
-      },
-      {
-        "label": "Yarn Serve",
-        "type": "shell",
-        "command": "yarn serve",
-        "dependsOn": ["Yarn Install"],
-        "options": {
-          "cwd": "${workspaceFolder}/vue"
-        }
-      },
-      {
-        "label": "Yarn Build",
-        "type": "shell",
-        "command": "yarn build",
-        "dependsOn": ["Yarn Install"],
-        "options": {
-          "cwd": "${workspaceFolder}/vue"
-        },
-        "group": "build",
-      },
-      {
-        "label": "Setup Tests",
-        "dependsOn": ["Run Migrations", "Collect Static Files"],
-      },
-      {
-        "label": "Run all pytests",
-        "type": "shell",
-        "command": "python3 -m pytest cookbook/tests",
-        "dependsOn": ["Setup Tests"],
-        "group": "test",
-      },
-      {
-        "label": "Setup Documentation Dependencies",
-        "type": "shell",
-        "command": "pip install mkdocs-material mkdocs-include-markdown-plugin",
-      },
-      {
-        "label": "Serve Documentation",
-        "type": "shell",
-        "command": "mkdocs serve",
-        "dependsOn": ["Setup Documentation Dependencies"],
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Run Migrations",
+      "type": "shell",
+      "command": "python3 manage.py migrate"
+    },
+    {
+      "label": "Collect Static Files",
+      "type": "shell",
+      "command": "python3 manage.py collectstatic",
+      "dependsOn": ["Yarn Build"]
+    },
+    {
+      "label": "Setup Dev Server",
+      "dependsOn": ["Run Migrations", "Yarn Build"]
+    },
+    {
+      "label": "Run Dev Server",
+      "type": "shell",
+      "dependsOn": ["Setup Dev Server"],
+      "command": "python3 manage.py runserver"
+    },
+    {
+      "label": "Yarn Install",
+      "dependsOn": ["Yarn Install - Vue", "Yarn Install - Vue3"]
+    },
+    {
+      "label": "Yarn Install - Vue",
+      "type": "shell",
+      "command": "yarn install --force",
+      "options": {
+        "cwd": "${workspaceFolder}/vue"
       }
-    ]
-}
+    },
+    {
+      "label": "Yarn Install - Vue3",
+      "type": "shell",
+      "command": "yarn install --force",
+      "options": {
+        "cwd": "${workspaceFolder}/vue3"
+      }
+    },
+    {
+      "label": "Generate API",
+      "dependsOn": ["Generate API - Vue", "Generate API - Vue3"]
+    },
+    {
+      "label": "Generate API - Vue",
+      "type": "shell",
+      "command": "openapi-generator-cli generate -g typescript-axios -i http://127.0.0.1:8000/openapi/",
+      "options": {
+        "cwd": "${workspaceFolder}/vue/src/utils/openapi"
+      }
+    },
+    {
+      "label": "Generate API - Vue3",
+      "type": "shell",
+      "command": "openapi-generator-cli generate -g typescript-fetch -i http://127.0.0.1:8000/openapi/",
+      "options": {
+        "cwd": "${workspaceFolder}/vue3/src/openapi"
+      }
+    },
+    {
+      "label": "Yarn Serve",
+      "type": "shell",
+      "command": "yarn serve",
+      "dependsOn": ["Yarn Install - Vue"],
+      "options": {
+        "cwd": "${workspaceFolder}/vue"
+      }
+    },
+    {
+      "label": "Vite Serve",
+      "type": "shell",
+      "command": "vite",
+      "dependsOn": ["Yarn Install - Vue3"],
+      "options": {
+        "cwd": "${workspaceFolder}/vue3"
+      }
+    },
+    {
+      "label": "Yarn Build",
+      "dependsOn": ["Yarn Build - Vue", "Vite Build - Vue3"],
+      "group": "build"
+    },
+    {
+      "label": "Yarn Build - Vue",
+      "type": "shell",
+      "command": "yarn build",
+      "dependsOn": ["Yarn Install - Vue"],
+      "options": {
+        "cwd": "${workspaceFolder}/vue"
+      },
+      "group": "build"
+    },
+    {
+      "label": "Vite Build - Vue3",
+      "type": "shell",
+      "command": "vite build",
+      "dependsOn": ["Yarn Install - Vue3"],
+      "options": {
+        "cwd": "${workspaceFolder}/vue3"
+      },
+      "group": "build"
+    },
+    {
+      "label": "Setup Tests",
+      "dependsOn": ["Run Migrations", "Collect Static Files"]
+    },
+    {
+      "label": "Run all pytests",
+      "type": "shell",
+      "command": "python3 -m pytest cookbook/tests",
+      "dependsOn": ["Setup Tests"],
+      "group": "test"
+    },
+    {
+      "label": "Setup Documentation Dependencies",
+      "type": "shell",
+      "command": "pip install mkdocs-material mkdocs-include-markdown-plugin"
+    },
+    {
+      "label": "Serve Documentation",
+      "type": "shell",
+      "command": "mkdocs serve",
+      "dependsOn": ["Setup Documentation Dependencies"]
+    }
+  ]
+}

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12-alpine3.19
+FROM python:3.13-alpine3.21
 
 #Install all dependencies.
 RUN apk add --no-cache postgresql-libs postgresql-client gettext zlib libjpeg libwebp libxml2-dev libxslt-dev openldap git
@@ -21,25 +21,31 @@ RUN \
     if [ `apk --print-arch` = "armv7" ]; then \
     printf "[global]\nextra-index-url=https://www.piwheels.org/simple\n" > /etc/pip.conf ; \
     fi
+
 # remove Development dependencies from requirements.txt
 RUN sed -i '/# Development/,$d' requirements.txt
-RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev libwebp-dev openssl-dev libffi-dev cargo openldap-dev python3-dev && \
+RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev libwebp-dev openssl-dev libffi-dev libgcc libstdc++ cargo openldap-dev python3-dev xmlsec-dev xmlsec build-base g++ curl && \
     echo -n "INPUT ( libldap.so )" > /usr/lib/libldap_r.so && \
     python -m venv venv && \
     /opt/recipes/venv/bin/python -m pip install --upgrade pip && \
-    venv/bin/pip install wheel==0.42.0 && \
-    venv/bin/pip install setuptools_rust==1.9.0 && \
+    venv/bin/pip debug -v && \
+    venv/bin/pip install wheel==0.45.1 && \
+    venv/bin/pip install setuptools_rust==1.10.2 && \
+    if [ `apk --print-arch` = "aarch64" ]; then \
+    curl https://sh.rustup.rs -sSf | sh -s -- -y; \
+    fi &&\
     venv/bin/pip install -r requirements.txt --no-cache-dir &&\
     apk --purge del .build-deps
 
 #Copy project and execute it.
 COPY . ./
 
-HEALTHCHECK --interval=30s \
-            --timeout=5s \
-            --start-period=10s \
-            --retries=3 \
-            CMD [ "/usr/bin/wget", "--no-verbose", "--tries=1", "--spider", "http://127.0.0.1:8080/openapi" ]
+# commented for now https://github.com/TandoorRecipes/recipes/issues/3478
+#HEALTHCHECK --interval=30s \
+#            --timeout=5s \
+#            --start-period=10s \
+#            --retries=3 \
+#            CMD [ "/usr/bin/wget", "--no-verbose", "--tries=1", "--spider", "http://127.0.0.1:8080/openapi" ]
 
 # collect information from git repositories
 RUN /opt/recipes/venv/bin/python version.py

cookbook/admin.py

@@ -10,7 +10,7 @@ from treebeard.forms import movenodeform_factory
 
 from cookbook.managers import DICTIONARY
 
-from .models import (BookmarkletImport, Comment, CookLog, Food, ImportLog, Ingredient, InviteLink,
+from .models import (BookmarkletImport, Comment, CookLog, CustomFilter, Food, ImportLog, Ingredient, InviteLink,
                      Keyword, MealPlan, MealType, NutritionInformation, Property, PropertyType,
                      Recipe, RecipeBook, RecipeBookEntry, RecipeImport, SearchPreference, ShareLink,
                      ShoppingListEntry, ShoppingListRecipe, Space, Step, Storage,
@@ -103,6 +103,13 @@ class ConnectorConfigAdmin(admin.ModelAdmin):
 admin.site.register(ConnectorConfig, ConnectorConfigAdmin)
 
 
+class CustomFilterAdmin(admin.ModelAdmin):
+    list_display = ('id', 'type', 'name')
+
+
+admin.site.register(CustomFilter, CustomFilterAdmin)
+
+
 class SyncAdmin(admin.ModelAdmin):
     list_display = ('storage', 'path', 'active', 'last_checked')
     search_fields = ('storage__name', 'path')

cookbook/helper/drf_spectacular_hooks.py

@@ -0,0 +1,102 @@
+# custom processing for schema
+# reason: DRF writable nested needs ID's to decide if a nested object should be created or updated
+# the API schema/client make ID's read only by default and strips them entirely in request objects (with COMPONENT_SPLIT_REQUEST enabled)
+# change the schema to make IDs optional but writable so they are included in the request
+
+def custom_postprocessing_hook(result, generator, request, public):
+    for c in result['components']['schemas'].keys():
+        # handle schemas used by the client to do requests on the server
+        if 'properties' in result['components']['schemas'][c] and 'id' in result['components']['schemas'][c]['properties']:
+            # make ID field not read only so it's not stripped from the request on the client
+            result['components']['schemas'][c]['properties']['id']['readOnly'] = False
+            # make ID field not required
+            if 'required' in result['components']['schemas'][c] and 'id' in result['components']['schemas'][c]['required']:
+                result['components']['schemas'][c]['required'].remove('id')
+
+    return result
+
+
+# TODO remove below once legacy API has been fully deprecated
+from drf_spectacular.openapi import AutoSchema  # noqa: E402 isort: skip
+import functools  # noqa: E402 isort: skip
+import re  # noqa: E402 isort: skip
+
+
+class LegacySchema(AutoSchema):
+    operation_id_base = None
+
+    @functools.cached_property
+    def path(self):
+        path = re.sub(pattern=self.path_prefix, repl='', string=self.path, flags=re.IGNORECASE)
+        # remove path variables
+        return re.sub(pattern=r'\{[\w\-]+\}', repl='', string=path)
+
+    def get_operation_id(self):
+        """
+        Compute an operation ID from the view type and get_operation_id_base method.
+        """
+        method_name = getattr(self.view, 'action', self.method.lower())
+        if self._is_list_view():
+            action = 'list'
+        elif method_name not in self.method_mapping:
+            action = self._to_camel_case(method_name)
+        else:
+            action = self.method_mapping[self.method.lower()]
+
+        name = self.get_operation_id_base(action)
+
+        return action + name
+
+    def get_operation_id_base(self, action):
+        """
+        Compute the base part for operation ID from the model, serializer or view name.
+        """
+        model = getattr(getattr(self.view, 'queryset', None), 'model', None)
+
+        if self.operation_id_base is not None:
+            name = self.operation_id_base
+
+        # Try to deduce the ID from the view's model
+        elif model is not None:
+            name = model.__name__
+
+        # Try with the serializer class name
+        elif self.get_serializer() is not None:
+            name = self.get_serializer().__class__.__name__
+            if name.endswith('Serializer'):
+                name = name[:-10]
+
+        # Fallback to the view name
+        else:
+            name = self.view.__class__.__name__
+            if name.endswith('APIView'):
+                name = name[:-7]
+            elif name.endswith('View'):
+                name = name[:-4]
+
+            # Due to camel-casing of classes and `action` being lowercase, apply title in order to find if action truly
+            # comes at the end of the name
+            if name.endswith(action.title()):  # ListView, UpdateAPIView, ThingDelete ...
+                name = name[:-len(action)]
+
+        if action == 'list' and not name.endswith('s'):  # listThings instead of listThing
+            name += 's'
+
+        return name
+
+    def get_serializer(self):
+        view = self.view
+
+        if not hasattr(view, 'get_serializer'):
+            return None
+
+        try:
+            return view.get_serializer()
+        except Exception:
+            return None
+
+    def _to_camel_case(self, snake_str):
+        components = snake_str.split('_')
+        # We capitalize the first letter of each component except the first one
+        # with the 'title' method and join them together.
+        return components[0] + ''.join(x.title() for x in components[1:])

cookbook/helper/image_processing.py

@@ -35,6 +35,20 @@ def get_filetype(name):
         return '.jpeg'
 
 
+def is_file_type_allowed(filename, image_only=False):
+    is_file_allowed = False
+    allowed_file_types = ['.pdf','.docx', '.xlsx']
+    allowed_image_types = ['.png', '.jpg', '.jpeg', '.gif', '.webp']
+    check_list = allowed_image_types
+    if not image_only:
+        check_list += allowed_file_types
+
+    for file_type in check_list:
+        if filename.lower().endswith(file_type):
+            is_file_allowed = True
+
+    return is_file_allowed
+
 # TODO this whole file needs proper documentation, refactoring, and testing
 # TODO also add env variable to define which images sizes should be compressed
 # filetype argument can not be optional, otherwise this function will treat all images as if they were a jpeg

cookbook/helper/ingredient_parser.py

@@ -118,7 +118,7 @@ class IngredientParser:
         note = ''
         start = 0
         # search for first occurrence of an argument ending in a comma
-        while start < len(tokens) and not tokens[start].endswith(','):
+        while start < len(tokens) and not tokens[start].endswith((',', ';', ':')):
             start += 1
         if start == len(tokens):
             # no token ending in a comma found -> use everything as food

cookbook/helper/mdx_attributes.py

@@ -6,8 +6,8 @@ class StyleTreeprocessor(Treeprocessor):
 
     def run_processor(self, node):
         for child in node:
-            if child.tag == "table":
-                child.set("class", "table table-bordered")
+            # if child.tag == "table":
+            #     child.set("class", "markdown-body")
             if child.tag == "img":
                 child.set("class", "img-fluid")
             self.run_processor(child)

cookbook/helper/open_data_importer.py

@@ -6,6 +6,8 @@ from cookbook.models import (Food, FoodProperty, Property, PropertyType, Superma
                              SupermarketCategory, SupermarketCategoryRelation, Unit, UnitConversion)
 import re
 
+from recipes.settings import DEBUG
+
 
 class OpenDataImportResponse:
     total_created = 0
@@ -367,12 +369,28 @@ class OpenDataImporter:
                 create_list.append({'data': obj_dict})
 
         if self.update_existing and len(update_list) > 0:
-            model_type.objects.bulk_update(update_list, field_list)
-            od_response.total_updated += len(update_list)
+            try:
+                model_type.objects.bulk_update(update_list, field_list)
+                od_response.total_updated += len(update_list)
+            except Exception:
+                if DEBUG:
+                    print('========= LOAD FOOD FAILED ============')
+                    print(update_list)
+                    print(existing_data_names)
+                    print(existing_data_slugs)
+                    traceback.print_exc()
 
         if len(create_list) > 0:
-            Food.load_bulk(create_list, None)
-            od_response.total_created += len(create_list)
+            try:
+                Food.load_bulk(create_list, None)
+                od_response.total_created += len(create_list)
+            except Exception:
+                if DEBUG:
+                    print('========= LOAD FOOD FAILED ============')
+                    print(create_list)
+                    print(existing_data_names)
+                    print(existing_data_slugs)
+                    traceback.print_exc()
 
         # --------------- PROPERTY STUFF -----------------------
         model_type = Property

cookbook/helper/permission_helper.py

@@ -160,18 +160,15 @@ class GroupRequiredMixin(object):
     def dispatch(self, request, *args, **kwargs):
         if not has_group_permission(request.user, self.groups_required):
             if not request.user.is_authenticated:
-                messages.add_message(request, messages.ERROR,
-                                     _('You are not logged in and therefore cannot view this page!'))
+                messages.add_message(request, messages.ERROR, _('You are not logged in and therefore cannot view this page!'))
                 return HttpResponseRedirect(reverse_lazy('account_login') + '?next=' + request.path)
             else:
-                messages.add_message(request, messages.ERROR,
-                                     _('You do not have the required permissions to view this page!'))
+                messages.add_message(request, messages.ERROR, _('You do not have the required permissions to view this page!'))
                 return HttpResponseRedirect(reverse_lazy('index'))
         try:
             obj = self.get_object()
             if obj.get_space() != request.space:
-                messages.add_message(request, messages.ERROR,
-                                     _('You do not have the required permissions to view this page!'))
+                messages.add_message(request, messages.ERROR, _('You do not have the required permissions to view this page!'))
                 return HttpResponseRedirect(reverse_lazy('index'))
         except AttributeError:
             pass

cookbook/helper/property_helper.py

@@ -44,13 +44,17 @@ class FoodPropertyHelper:
             if i.food is not None:
                 conversions = uch.get_conversions(i)
                 for pt in property_types:
+                    # if a property could be calculated with an actual value
                     found_property = False
+                    # if food has a value for the given property type (no matter if conversion is possible)
+                    has_property_value = False
                     if i.food.properties_food_amount == 0 or i.food.properties_food_unit is None:  # if food is configured incorrectly
-                        computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': i.food.name, 'value': None}
+                        computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': {'id': i.food.id, 'name': i.food.name}, 'value': None}
                         computed_properties[pt.id]['missing_value'] = True
                     else:
                         for p in i.food.properties.all():
                             if p.property_type == pt and p.property_amount is not None:
+                                has_property_value = True
                                 for c in conversions:
                                     if c.unit == i.food.properties_food_unit:
                                         found_property = True
@@ -60,10 +64,12 @@ class FoodPropertyHelper:
                     if not found_property:
                         if i.amount == 0:  # don't count ingredients without an amount as missing
                             computed_properties[pt.id]['missing_value'] = computed_properties[pt.id]['missing_value'] or False  # don't override if another food was already missing
-                            computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': i.food.name, 'value': 0}
+                            computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': {'id': i.food.id, 'name': i.food.name}, 'value': 0}
                         else:
                             computed_properties[pt.id]['missing_value'] = True
-                            computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': i.food.name, 'value': None}
+                            computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': {'id': i.food.id, 'name': i.food.name}, 'value': None}
+                            if has_property_value and i.unit is not None:
+                                computed_properties[pt.id]['food_values'][i.food.id]['missing_conversion'] = {'base_unit': {'id': i.unit.id, 'name': i.unit.name}, 'converted_unit': {'id': i.food.properties_food_unit.id, 'name': i.food.properties_food_unit.name}}
 
         return computed_properties
 
@@ -74,5 +80,5 @@ class FoodPropertyHelper:
         if key in d and d[key]['value']:
             d[key]['value'] += value
         else:
-            d[key] = {'id': food.id, 'food': food.name, 'value': value}
+            d[key] = {'id': food.id, 'food': {'id': food.id, 'name': food.name}, 'value': value}
         return d

cookbook/helper/recipe_search.py

@@ -49,7 +49,11 @@ class RecipeSearch():
             self._search_prefs = SearchPreference()
         self._string = self._params.get('query').strip(
         ) if self._params.get('query', None) else None
+
         self._rating = self._params.get('rating', None)
+        self._rating_gte = self._params.get('rating_gte', None)
+        self._rating_lte = self._params.get('rating_lte', None)
+
         self._keywords = {
             'or': self._params.get('keywords_or', None) or self._params.get('keywords', None),
             'and': self._params.get('keywords_and', None),
@@ -70,20 +74,36 @@ class RecipeSearch():
         }
         self._steps = self._params.get('steps', None)
         self._units = self._params.get('units', None)
-        # TODO add created by
-        # TODO image exists
-        self._sort_order = self._params.get('sort_order', None)
         self._internal = str2bool(self._params.get('internal', None))
-        self._random = str2bool(self._params.get('random', False))
+        self._sort_order = self._params.get('sort_order', None)
+        if self._sort_order == 'random':
+            self._random = True
+            self.sort_order = None
+        else:
+            self._random = str2bool(self._params.get('random', False))
         self._new = str2bool(self._params.get('new', False))
         self._num_recent = int(self._params.get('num_recent', 0))
         self._include_children = str2bool(
             self._params.get('include_children', None))
         self._timescooked = self._params.get('timescooked', None)
-        self._cookedon = self._params.get('cookedon', None)
+        self._timescooked_gte = self._params.get('timescooked_gte', None)
+        self._timescooked_lte = self._params.get('timescooked_lte', None)
+
         self._createdon = self._params.get('createdon', None)
+        self._createdon_gte = self._params.get('createdon_gte', None)
+        self._createdon_lte = self._params.get('createdon_lte', None)
+
         self._updatedon = self._params.get('updatedon', None)
-        self._viewedon = self._params.get('viewedon', None)
+        self._updatedon_gte = self._params.get('updatedon_gte', None)
+        self._updatedon_lte = self._params.get('updatedon_lte', None)
+
+        self._viewedon_gte = self._params.get('viewedon_gte', None)
+        self._viewedon_lte = self._params.get('viewedon_lte', None)
+
+        self._cookedon_gte = self._params.get('cookedon_gte', None)
+        self._cookedon_lte = self._params.get('cookedon_lte', None)
+
+        self._createdby = self._params.get('createdby', None)
         self._makenow = self._params.get('makenow', None)
         # this supports hidden feature to find recipes missing X ingredients
         if isinstance(self._makenow, bool) and self._makenow == True:
@@ -130,16 +150,19 @@ class RecipeSearch():
 
         self._build_sort_order()
         self._recently_viewed(num_recent=self._num_recent)
-        self._cooked_on_filter(cooked_date=self._cookedon)
-        self._created_on_filter(created_date=self._createdon)
-        self._updated_on_filter(updated_date=self._updatedon)
-        self._viewed_on_filter(viewed_date=self._viewedon)
-        self._favorite_recipes(times_cooked=self._timescooked)
+
+        self._cooked_on_filter()
+        self._created_on_filter()
+        self._updated_on_filter()
+        self._viewed_on_filter()
+
+        self._created_by_filter(created_by_user_id=self._createdby)
+        self._favorite_recipes()
         self._new_recipes()
         self.keyword_filters(**self._keywords)
         self.food_filters(**self._foods)
         self.book_filters(**self._books)
-        self.rating_filter(rating=self._rating)
+        self.rating_filter()
         self.internal_filter(internal=self._internal)
         self.step_filters(steps=self._steps)
         self.unit_filters(units=self._units)
@@ -186,9 +209,9 @@ class RecipeSearch():
             else:
                 order += default_order
             order[:] = [Lower('name').asc() if x ==
-                        'name' else x for x in order]
+                                               'name' else x for x in order]
             order[:] = [Lower('name').desc() if x ==
-                        '-name' else x for x in order]
+                                                '-name' else x for x in order]
             self.orderby = order
 
     def string_filters(self, string=None):
@@ -227,9 +250,9 @@ class RecipeSearch():
                 query_filter |= Q(**{"%s" % f: self._string})
             self._queryset = self._queryset.filter(query_filter).distinct()
 
-    def _cooked_on_filter(self, cooked_date=None):
-        if self._sort_includes('lastcooked') or cooked_date:
-            lessthan = self._sort_includes('-lastcooked') or '-' in (cooked_date or [])[:1]
+    def _cooked_on_filter(self):
+        if self._sort_includes('lastcooked') or self._cookedon_gte or self._cookedon_lte:
+            lessthan = self._sort_includes('-lastcooked') or self._cookedon_lte
             if lessthan:
                 default = timezone.now() - timedelta(days=100000)
             else:
@@ -237,51 +260,44 @@ class RecipeSearch():
             self._queryset = self._queryset.annotate(
                 lastcooked=Coalesce(Max(Case(When(cooklog__created_by=self._request.user, cooklog__space=self._request.space, then='cooklog__created_at'))), Value(default))
             )
-        if cooked_date is None:
-            return
 
-        cooked_date = date(*[int(x)for x in cooked_date.split('-') if x != ''])
-
-        if lessthan:
-            self._queryset = self._queryset.filter(lastcooked__date__lte=cooked_date).exclude(lastcooked=default)
-        else:
-            self._queryset = self._queryset.filter(lastcooked__date__gte=cooked_date).exclude(lastcooked=default)
-
-    def _created_on_filter(self, created_date=None):
-        if created_date is None:
-            return
-        lessthan = '-' in created_date[:1]
-        created_date = date(*[int(x) for x in created_date.split('-') if x != ''])
-        if lessthan:
-            self._queryset = self._queryset.filter(created_at__date__lte=created_date)
-        else:
-            self._queryset = self._queryset.filter(created_at__date__gte=created_date)
-
-    def _updated_on_filter(self, updated_date=None):
-        if updated_date is None:
-            return
-        lessthan = '-' in updated_date[:1]
-        updated_date = date(*[int(x)for x in updated_date.split('-') if x != ''])
-        if lessthan:
-            self._queryset = self._queryset.filter(updated_at__date__lte=updated_date)
-        else:
-            self._queryset = self._queryset.filter(updated_at__date__gte=updated_date)
+        if self._cookedon_lte:
+            self._queryset = self._queryset.filter(lastcooked__date__lte=self._cookedon_lte).exclude(lastcooked=default)
+        elif self._cookedon_gte:
+            self._queryset = self._queryset.filter(lastcooked__date__gte=self._cookedon_gte).exclude(lastcooked=default)
 
     def _viewed_on_filter(self, viewed_date=None):
-        if self._sort_includes('lastviewed') or viewed_date:
+        if self._sort_includes('lastviewed') or self._viewedon_gte or self._viewedon_lte:
             longTimeAgo = timezone.now() - timedelta(days=100000)
             self._queryset = self._queryset.annotate(
                 lastviewed=Coalesce(Max(Case(When(viewlog__created_by=self._request.user, viewlog__space=self._request.space, then='viewlog__created_at'))), Value(longTimeAgo))
             )
-        if viewed_date is None:
-            return
-        lessthan = '-' in viewed_date[:1]
-        viewed_date = date(*[int(x)for x in viewed_date.split('-') if x != ''])
 
-        if lessthan:
-            self._queryset = self._queryset.filter(lastviewed__date__lte=viewed_date).exclude(lastviewed=longTimeAgo)
-        else:
-            self._queryset = self._queryset.filter(lastviewed__date__gte=viewed_date).exclude(lastviewed=longTimeAgo)
+        if self._viewedon_lte:
+            self._queryset = self._queryset.filter(lastviewed__date__lte=self._viewedon_lte).exclude(lastviewed=longTimeAgo)
+        elif self._viewedon_gte:
+            self._queryset = self._queryset.filter(lastviewed__date__gte=self._viewedon_gte).exclude(lastviewed=longTimeAgo)
+
+    def _created_on_filter(self):
+        if self._createdon:
+            self._queryset = self._queryset.filter(created_at__date=self._createdon)
+        elif self._createdon_lte:
+            self._queryset = self._queryset.filter(created_at__date__lte=self._createdon_lte)
+        elif self._createdon_gte:
+            self._queryset = self._queryset.filter(created_at__date__gte=self._createdon_gte)
+
+    def _updated_on_filter(self):
+        if self._updatedon:
+            self._queryset = self._queryset.filter(updated_at__date__date=self._updatedon)
+        elif self._updatedon_lte:
+            self._queryset = self._queryset.filter(updated_at__date__lte=self._updatedon_lte)
+        elif self._updatedon_gte:
+            self._queryset = self._queryset.filter(updated_at__date__gte=self._updatedon_gte)
+
+    def _created_by_filter(self, created_by_user_id=None):
+        if created_by_user_id is None:
+            return
+        self._queryset = self._queryset.filter(created_by__id=created_by_user_id)
 
     def _new_recipes(self, new_days=7):
         # TODO make new days a user-setting
@@ -307,9 +323,9 @@ class RecipeSearch():
         )
         self._queryset = self._queryset.annotate(recent=Coalesce(Max(Case(When(pk__in=num_recent_recipes.values('recipe'), then='viewlog__pk'))), Value(0)))
 
-    def _favorite_recipes(self, times_cooked=None):
-        if self._sort_includes('favorite') or times_cooked:
-            less_than = '-' in (str(times_cooked) or []) and not self._sort_includes('-favorite')
+    def _favorite_recipes(self):
+        if self._sort_includes('favorite') or self._timescooked or self._timescooked_gte or self._timescooked_lte:
+            less_than = self._timescooked_lte and not self._sort_includes('-favorite')
             if less_than:
                 default = 1000
             else:
@@ -321,15 +337,13 @@ class RecipeSearch():
                 .values('count')
             )
             self._queryset = self._queryset.annotate(favorite=Coalesce(Subquery(favorite_recipes), default))
-        if times_cooked is None:
-            return
 
-        if times_cooked == '0':
+        if self._timescooked:
             self._queryset = self._queryset.filter(favorite=0)
-        elif less_than:
-            self._queryset = self._queryset.filter(favorite__lte=int(times_cooked.replace('-', ''))).exclude(favorite=0)
-        else:
-            self._queryset = self._queryset.filter(favorite__gte=int(times_cooked))
+        elif self._timescooked_lte:
+            self._queryset = self._queryset.filter(favorite__lte=int(self._timescooked_lte)).exclude(favorite=0)
+        elif self._timescooked_gte:
+            self._queryset = self._queryset.filter(favorite__gte=int(self._timescooked_gte))
 
     def keyword_filters(self, **kwargs):
         if all([kwargs[x] is None for x in kwargs]):
@@ -407,25 +421,16 @@ class RecipeSearch():
             units = [units]
         self._queryset = self._queryset.filter(steps__ingredients__unit__in=units)
 
-    def rating_filter(self, rating=None):
-        if rating or self._sort_includes('rating'):
-            lessthan = '-' in (rating or [])
-            reverse = 'rating' in (self._sort_order or []) and '-rating' not in (self._sort_order or [])
-            if lessthan or reverse:
-                default = 100
-            else:
-                default = 0
-            # TODO make ratings a settings user-only vs all-users
-            self._queryset = self._queryset.annotate(rating=Round(Avg(Case(When(cooklog__created_by=self._request.user, then='cooklog__rating'), default=default))))
-        if rating is None:
-            return
+    def rating_filter(self):
+        if self._rating or self._rating_lte or self._rating_gte or self._sort_includes('rating'):
+            self._queryset = self._queryset.annotate(rating=Round(Avg(Case(When(cooklog__created_by=self._request.user, then='cooklog__rating'), default=0))))
 
-        if rating == '0':
-            self._queryset = self._queryset.filter(rating=0)
-        elif lessthan:
-            self._queryset = self._queryset.filter(rating__lte=int(rating[1:])).exclude(rating=0)
-        else:
-            self._queryset = self._queryset.filter(rating__gte=int(rating))
+        if self._rating:
+            self._queryset = self._queryset.filter(rating=round(int(self._rating)))
+        elif self._rating_gte:
+            self._queryset = self._queryset.filter(rating__gte=int(self._rating_gte))
+        elif self._rating_lte:
+            self._queryset = self._queryset.filter(rating__gte=int(self._rating_lte)).exclude(rating=0)
 
     def internal_filter(self, internal=None):
         if not internal:
@@ -535,11 +540,11 @@ class RecipeSearch():
         shopping_users = [*self._request.user.get_shopping_share(), self._request.user]
 
         onhand_filter = (
-            Q(steps__ingredients__food__onhand_users__in=shopping_users)  # food onhand
-            # or substitute food onhand
-            | Q(steps__ingredients__food__substitute__onhand_users__in=shopping_users)
-            | Q(steps__ingredients__food__in=self.__children_substitute_filter(shopping_users))
-            | Q(steps__ingredients__food__in=self.__sibling_substitute_filter(shopping_users))
+                Q(steps__ingredients__food__onhand_users__in=shopping_users)  # food onhand
+                # or substitute food onhand
+                | Q(steps__ingredients__food__substitute__onhand_users__in=shopping_users)
+                | Q(steps__ingredients__food__in=self.__children_substitute_filter(shopping_users))
+                | Q(steps__ingredients__food__in=self.__sibling_substitute_filter(shopping_users))
         )
         makenow_recipes = Recipe.objects.annotate(
             count_food=Count('steps__ingredients__food__pk', filter=Q(steps__ingredients__food__isnull=False), distinct=True),

cookbook/helper/recipe_url_import.py

@@ -106,14 +106,14 @@ def get_from_scraper(scrape, request):
 
     # assign image
     try:
-        recipe_json['image'] = parse_image(scrape.image()) or None
+        recipe_json['image_url'] = parse_image(scrape.image()) or None
     except Exception:
-        recipe_json['image'] = None
-    if not recipe_json['image']:
+        recipe_json['image_url'] = None
+    if not recipe_json['image_url']:
         try:
-            recipe_json['image'] = parse_image(scrape.schema.data.get('image')) or ''
+            recipe_json['image_url'] = parse_image(scrape.schema.data.get('image')) or ''
         except Exception:
-            recipe_json['image'] = ''
+            recipe_json['image_url'] = ''
 
     # assign keywords
     try:
@@ -205,6 +205,7 @@ def get_from_scraper(scrape, request):
     except Exception:
         pass
 
+    recipe_json['properties'] = []
     try:
         recipe_json['properties'] = get_recipe_properties(request.space, scrape.schema.nutrients())
         print(recipe_json['properties'])
@@ -227,6 +228,13 @@ def get_recipe_properties(space, property_data):
         "property-proteins": "proteinContent",
         "property-fats": "fatContent",
     }
+
+    serving_size = 1
+    try:
+        serving_size = parse_servings(property_data['servingSize'])
+    except KeyError:
+        pass
+
     recipe_properties = []
     for pt in PropertyType.objects.filter(space=space, open_data_slug__in=list(properties.keys())).all():
         for p in list(properties.keys()):
@@ -237,7 +245,7 @@ def get_recipe_properties(space, property_data):
                             'id': pt.id,
                             'name': pt.name,
                         },
-                        'property_amount': parse_servings(property_data[properties[p]]) / parse_servings(property_data['servingSize']),
+                        'property_amount': parse_servings(property_data[properties[p]]) / serving_size,
                     })
 
     return recipe_properties
@@ -424,9 +432,9 @@ def parse_keywords(keyword_json, request):
         if len(kw) != 0:
             kw = automation_engine.apply_keyword_automation(kw)
             if k := Keyword.objects.filter(name__iexact=kw, space=request.space).first():
-                keywords.append({'label': str(k), 'name': k.name, 'id': k.id})
+                keywords.append({'label': str(k), 'name': k.name, 'id': k.id, 'import_keyword': True})
             else:
-                keywords.append({'label': kw, 'name': kw})
+                keywords.append({'label': kw, 'name': kw, 'import_keyword': False})
 
     return keywords
 

cookbook/helper/shopping_helper.py

@@ -113,7 +113,7 @@ class RecipeShoppingEditor():
         if not self.servings:
             self.servings = getattr(self.mealplan, 'servings', None) or getattr(self.recipe, 'servings', 1.0)
 
-        self._shopping_list_recipe = ShoppingListRecipe.objects.create(recipe=self.recipe, mealplan=self.mealplan, servings=self.servings)
+        self._shopping_list_recipe = ShoppingListRecipe.objects.create(recipe=self.recipe, mealplan=self.mealplan, servings=self.servings, space=self.space, created_by=self.created_by)
 
         if ingredients:
             self._add_ingredients(ingredients=ingredients)
@@ -153,8 +153,9 @@ class RecipeShoppingEditor():
             return True
 
         for sle in ShoppingListEntry.objects.filter(list_recipe=self._shopping_list_recipe):
-            sle.amount = sle.ingredient.amount * Decimal(self._servings_factor)
-            sle.save()
+            if sle.ingredient: # TODO temporarily dont scale manual entries until ingredient_amount or some other base amount has been migrated to SLE
+                sle.amount = sle.ingredient.amount * Decimal(self._servings_factor)
+                sle.save()
         self._shopping_list_recipe.servings = self.servings
         self._shopping_list_recipe.save()
         return True

cookbook/helper/template_helper.py

@@ -70,7 +70,7 @@ def render_instructions(step):  # TODO deduplicate markdown cleanup code
     parsed_md = md.markdown(
         instructions,
         extensions=[
-            'markdown.extensions.fenced_code', TableExtension(),
+            'markdown.extensions.fenced_code', 'markdown.extensions.sane_lists', 'markdown.extensions.nl2br', TableExtension(),
             UrlizeExtension(), MarkdownFormatExtension()
         ]
     )

cookbook/integration/paprika.py

@@ -94,7 +94,8 @@ class Paprika(Integration):
                     url = recipe_json.get("image_url", None)
                     if validate_import_url(url):
                         response = requests.get(url)
-                        self.import_recipe_image(recipe, BytesIO(response.content))
+                        if response.status_code == 200 and len(response.content) > 0:
+                            self.import_recipe_image(recipe, BytesIO(response.content))
             except Exception:
                 pass
 

cookbook/integration/recettetek.py

@@ -1,10 +1,10 @@
-import imghdr
 import json
 import re
 from io import BytesIO
 from zipfile import ZipFile
 
 import requests
+from PIL import Image
 
 from django.utils.translation import gettext as _
 
@@ -128,7 +128,7 @@ class RecetteTek(Integration):
                     url = file['originalPicture']
                     if validate_import_url(url):
                         response = requests.get(url)
-                        if imghdr.what(BytesIO(response.content)) is not None:
+                        if Image.open(BytesIO(response.content)).verify():
                             self.import_recipe_image(recipe, BytesIO(response.content), filetype=get_filetype(file['originalPicture']))
                         else:
                             raise Exception("Original image failed to download.")

cookbook/locale/ca/LC_MESSAGES/django.po

@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-01 15:04+0200\n"
-"PO-Revision-Date: 2024-03-08 23:19+0000\n"
-"Last-Translator: Enric Bergadà <enric@bergada.cat>\n"
+"PO-Revision-Date: 2025-03-12 09:58+0000\n"
+"Last-Translator: Nico G <aprops@gmail.com>\n"
 "Language-Team: Catalan <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/ca/>\n"
 "Language: ca\n"
@@ -22,7 +22,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.15\n"
+"X-Generator: Weblate 5.8.4\n"
 
 #: .\cookbook\forms.py:45
 msgid ""
@@ -95,14 +95,17 @@ msgid ""
 "<a href=\"https://www.home-assistant.io/docs/authentication/#your-account-"
 "profile\">Long Lived Access Token</a> for your HomeAssistant instance"
 msgstr ""
+"<a href=\"https://www.home-assistant.io/docs/authentication/#your-account-"
+"profile\">Token d'accés de llarga durada</a> per a la teva instància de "
+"HomeAssistant"
 
 #: .\cookbook\forms.py:193
 msgid "Something like http://homeassistant.local:8123/api"
-msgstr ""
+msgstr "Alguna cosa similar a http://homeassistant.local:8123/api"
 
 #: .\cookbook\forms.py:205
 msgid "http://homeassistant.local:8123/api for example"
-msgstr ""
+msgstr "Per exemple http://homeassistant.local:8123/api"
 
 #: .\cookbook\forms.py:222 .\cookbook\views\edit.py:117
 msgid "Storage"
@@ -288,27 +291,27 @@ msgstr "Utilitza fraccions"
 
 #: .\cookbook\helper\recipe_url_import.py:311
 msgid "careful rotation"
-msgstr ""
+msgstr "Rotació amb cura"
 
 #: .\cookbook\helper\recipe_url_import.py:312
 msgid "knead"
-msgstr ""
+msgstr "amassar"
 
 #: .\cookbook\helper\recipe_url_import.py:313
 msgid "thicken"
-msgstr ""
+msgstr "espessir"
 
 #: .\cookbook\helper\recipe_url_import.py:314
 msgid "warm up"
-msgstr ""
+msgstr "preescalfar"
 
 #: .\cookbook\helper\recipe_url_import.py:315
 msgid "ferment"
-msgstr ""
+msgstr "fermentar"
 
 #: .\cookbook\helper\recipe_url_import.py:316
 msgid "sous-vide"
-msgstr ""
+msgstr "sous-vide"
 
 #: .\cookbook\helper\shopping_helper.py:150
 msgid "You must supply a servings size"
@@ -354,10 +357,8 @@ msgid "Imported %s recipes."
 msgstr "%s Receptes Importades."
 
 #: .\cookbook\integration\openeats.py:28
-#, fuzzy
-#| msgid "Recipe Home"
 msgid "Recipe source:"
-msgstr "Receptari"
+msgstr "Origen de la recepta:"
 
 #: .\cookbook\integration\paprika.py:49
 msgid "Notes"
@@ -398,11 +399,11 @@ msgstr "Secció"
 
 #: .\cookbook\management\commands\fix_duplicate_properties.py:15
 msgid "Fixes foods with "
-msgstr ""
+msgstr "Arregla els aliments amb "
 
 #: .\cookbook\management\commands\rebuildindex.py:14
 msgid "Rebuilds full text search index on Recipe"
-msgstr "Reconstrueix l'índex de cerca de text complet a Recipta"
+msgstr "Reconstrueix l'índex de cerca de text complet de la recepta"
 
 #: .\cookbook\management\commands\rebuildindex.py:18
 msgid "Only Postgresql databases use full text search, no index to rebuild"
@@ -416,7 +417,7 @@ msgstr "S'ha completat la reconstrucció de l'índex de receptes."
 
 #: .\cookbook\management\commands\rebuildindex.py:31
 msgid "Recipe index rebuild failed."
-msgstr "Reconstrucció de l'índex de receptes fallida."
+msgstr "La reconstrucció de l'índex de receptes ha fallat."
 
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:14
 msgid "Breakfast"
@@ -432,7 +433,7 @@ msgstr "Sopar"
 
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:29 .\cookbook\models.py:919
 msgid "Other"
-msgstr "Un altre"
+msgstr "Altres"
 
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:17
 #, fuzzy
@@ -444,7 +445,7 @@ msgstr "Greixos"
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:18
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:19
 msgid "g"
-msgstr ""
+msgstr "g"
 
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:18
 msgid "Carbohydrates"
@@ -460,7 +461,7 @@ msgstr "Calories"
 
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:20
 msgid "kcal"
-msgstr ""
+msgstr "kcal"
 
 #: .\cookbook\models.py:325
 msgid ""
@@ -478,7 +479,7 @@ msgstr "Cerca"
 #: .\cookbook\models.py:455 .\cookbook\templates\base.html:114
 #: .\cookbook\templates\meal_plan.html:7
 msgid "Meal-Plan"
-msgstr "Plans de Menjar"
+msgstr "Planificació d'àpats"
 
 #: .\cookbook\models.py:456 .\cookbook\templates\base.html:122
 #: .\cookbook\views\views.py:459
@@ -496,21 +497,19 @@ msgstr " forma part d'un pas de recepta i no es pot suprimir"
 
 #: .\cookbook\models.py:918
 msgid "Nutrition"
-msgstr "Nutrició"
+msgstr "Informació nutricional"
 
 #: .\cookbook\models.py:918
-#, fuzzy
-#| msgid "Merge"
 msgid "Allergen"
-msgstr "Combina"
+msgstr "Al·lèrgens"
 
 #: .\cookbook\models.py:919
 msgid "Price"
-msgstr ""
+msgstr "Preu"
 
 #: .\cookbook\models.py:919
 msgid "Goal"
-msgstr ""
+msgstr "Fita"
 
 #: .\cookbook\models.py:1408 .\cookbook\templates\search_info.html:28
 msgid "Simple"
@@ -530,27 +529,23 @@ msgstr "Cru"
 
 #: .\cookbook\models.py:1467
 msgid "Food Alias"
-msgstr "Alies Menjar"
+msgstr "Aliment equivalent"
 
 #: .\cookbook\models.py:1468
 msgid "Unit Alias"
-msgstr "Àlies Unitat"
+msgstr "Unitat equivalent"
 
 #: .\cookbook\models.py:1469
 msgid "Keyword Alias"
-msgstr "Àlies Paraula clau"
+msgstr "Paraula clau equivalent"
 
 #: .\cookbook\models.py:1470
-#, fuzzy
-#| msgid "Description"
 msgid "Description Replace"
-msgstr "Descripció"
+msgstr "Substitució de la descripció"
 
 #: .\cookbook\models.py:1471
-#, fuzzy
-#| msgid "Instructions"
 msgid "Instruction Replace"
-msgstr "Instruccions"
+msgstr "Substituir les Instruccions"
 
 #: .\cookbook\models.py:1472
 #, fuzzy
@@ -560,13 +555,11 @@ msgstr "Nova Unitat"
 
 #: .\cookbook\models.py:1473
 msgid "Transpose Words"
-msgstr ""
+msgstr "Substituir les paraules"
 
 #: .\cookbook\models.py:1474
-#, fuzzy
-#| msgid "Food Alias"
 msgid "Food Replace"
-msgstr "Alies Menjar"
+msgstr "Aliment equivalent"
 
 #: .\cookbook\models.py:1475
 #, fuzzy
@@ -576,7 +569,7 @@ msgstr "Descripció"
 
 #: .\cookbook\models.py:1476
 msgid "Name Replace"
-msgstr ""
+msgstr "Substitueix Nom"
 
 #: .\cookbook\models.py:1503 .\cookbook\views\delete.py:40
 #: .\cookbook\views\edit.py:210 .\cookbook\views\new.py:39
@@ -603,7 +596,7 @@ msgstr "Límit de càrrega de fitxers Assolit."
 
 #: .\cookbook\serializer.py:328
 msgid "Cannot modify Space owner permission."
-msgstr ""
+msgstr "No pots modificar els permisos del propietari de la instància."
 
 #: .\cookbook\serializer.py:1270
 msgid "Hello"
@@ -1033,7 +1026,7 @@ msgstr "Exporta"
 
 #: .\cookbook\templates\base.html:287
 msgid "Properties"
-msgstr ""
+msgstr "Propietats"
 
 #: .\cookbook\templates\base.html:301 .\cookbook\views\lists.py:255
 #, fuzzy
@@ -1082,7 +1075,7 @@ msgstr "Sense Espai"
 #: .\cookbook\templates\base.html:362
 #: .\cookbook\templates\space_overview.html:6
 msgid "Overview"
-msgstr ""
+msgstr "Vista general"
 
 #: .\cookbook\templates\base.html:372
 msgid "Markdown Guide"
@@ -1106,11 +1099,11 @@ msgstr "Tanca sessió"
 
 #: .\cookbook\templates\base.html:406
 msgid "You are using the free version of Tandor"
-msgstr ""
+msgstr "Estàs fent servir una versió gratuïta de Tandor"
 
 #: .\cookbook\templates\base.html:407
 msgid "Upgrade Now"
-msgstr ""
+msgstr "Actualitzar ara"
 
 #: .\cookbook\templates\batch\edit.html:6
 msgid "Batch edit Category"
@@ -1207,7 +1200,7 @@ msgstr "Segur que vols esborrar el %(title)s:<b>%(object)s</b> "
 
 #: .\cookbook\templates\generic\delete_template.html:22
 msgid "This cannot be undone!"
-msgstr ""
+msgstr "Aquesta operació no pot desfer-se!"
 
 #: .\cookbook\templates\generic\delete_template.html:27
 msgid "Protected"
@@ -1523,7 +1516,7 @@ msgstr ""
 #: .\cookbook\templates\openid\login.html:27
 #: .\cookbook\templates\socialaccount\authentication_error.html:27
 msgid "Back"
-msgstr ""
+msgstr "Enrere"
 
 #: .\cookbook\templates\property_editor.html:7
 #, fuzzy
@@ -1565,6 +1558,15 @@ msgid ""
 "only available if you are using Postgres for your database.\n"
 "    "
 msgstr ""
+"\n"
+"        Aconseguir la millor experiència de cerca és complicada i recau en "
+"gran mesura en la teva configuració personal.  \n"
+"        Canviar qualsevol configuració de cerca pot tenir un gran impacte en "
+"la velocitat i els resultats obtinguts.\n"
+"        Els mètodes de cerca, els Trigrames i les configuracions de cerca de "
+"text complet només estan disponibles si feu servir Postgres per a la vostra "
+"base de dades.\n"
+"    "
 
 #: .\cookbook\templates\search_info.html:19
 msgid "Search Methods"
@@ -1584,6 +1586,17 @@ msgid ""
 "html#TEXTSEARCH-PARSING-QUERIES>Postgresql's website.</a>\n"
 "            "
 msgstr ""
+" \n"
+"            Les cerques de text complet intenten normalitzar les paraules "
+"proporcionades perquè coincideixin amb les variants habituals. Per exemple: "
+"'forquilla', 'forquilles', es normalitzaran tots a 'forquilla'.\n"
+"            Hi ha diversos mètodes disponibles, que es descriuen a "
+"continuació, que controlaran com ha de reaccionar el comportament de cerca "
+"quan es cerquen diverses paraules.\n"
+"            Els detalls tècnics complets sobre com funcionen es poden "
+"consultar a <a href=https://www.postgresql.org/docs/current/textsearch-"
+"controls.html#TEXTSEARCH-PARSING-QUERIES>Postgresql's website.</a>\n"
+"            "
 
 #: .\cookbook\templates\search_info.html:29
 msgid ""
@@ -1595,6 +1608,14 @@ msgid ""
 "selected for a full text search.\n"
 "            "
 msgstr ""
+" \n"
+"            Les cerques simples ignoren la puntuació i les paraules "
+"habituals com ara \"el\", \"a\", \"i\". I tractarà paraules separades segons "
+"sigui necessari.\n"
+"            Si cerqueu \"poma o farina\", es tornarà qualsevol recepta que "
+"inclogui \"poma\" i \"farina\" a qualsevol part dels camps que s'han "
+"seleccionat per a una cerca de text complet.\n"
+"            "
 
 #: .\cookbook\templates\search_info.html:34
 msgid ""
@@ -1606,6 +1627,13 @@ msgid ""
 "been selected for a full text search.\n"
 "            "
 msgstr ""
+" \n"
+"            Les cerques de frases ignoren la puntuació, però cercaran totes "
+"les paraules en l'ordre exacte que s'indiquen.\n"
+"            La cerca de \"poma o farina\" només retornarà una recepta que "
+"inclogui la frase exacta \"poma o farina\" en qualsevol dels camps que s'han "
+"seleccionat per a una cerca de text complet.\n"
+"            "
 
 #: .\cookbook\templates\search_info.html:39
 msgid ""
@@ -1625,6 +1653,22 @@ msgid ""
 "recipe that has the word 'butter' in any field included.\n"
 "            "
 msgstr ""
+" \n"
+"            Les cerques web simulen la funcionalitat que es troba a molts "
+"llocs de cerca web que admeten una sintaxi especial.\n"
+"            Col·locar cometes al voltant de diverses paraules convertirà "
+"aquestes paraules en una frase.\n"
+"            \"or\" es reconeix com a cercar la paraula (o frase) "
+"immediatament abans de \"or\" O la paraula (o frase) directament després.\n"
+"            '-' es reconeix com la recerca de receptes que no inclouen la "
+"paraula (o frase) que ve immediatament després. \n"
+"            Per exemple, si cerqueu \"pastís de poma\" o mantega de cireres, "
+"es retornarà qualsevol recepta que inclogui la frase \"pastís de poma\" o la "
+"paraula \"cirera\". \n"
+"            En qualsevol camp inclòs a la cerca de text complet, però exclou "
+"qualsevol recepta que tingui la paraula \"mantega\" en qualsevol camp inclòs."
+"\n"
+"            "
 
 #: .\cookbook\templates\search_info.html:48
 msgid ""
@@ -1633,6 +1677,10 @@ msgid ""
 "operators such as '|', '&' and '()'\n"
 "            "
 msgstr ""
+" \n"
+"            La cerca en brut és similar a la web, excepte que prendrà "
+"operadors de puntuació com ara '|', '&' i '()'\n"
+"            "
 
 #: .\cookbook\templates\search_info.html:59
 msgid ""
@@ -1648,6 +1696,17 @@ msgid ""
 "methods.\n"
 "            "
 msgstr ""
+" \n"
+"            Un altre enfocament de cerca que també requereix Postgresql és "
+"la cerca difusa o la semblança de trigrames. Un trigrama és un grup de tres "
+"caràcters consecutius.\n"
+"            Per exemple, cercar \"pastís\" crearà x trigrames \"pas\", \"ast"
+"\", \"tís\" i crearà una puntuació de la proximitat de les paraules amb els "
+"trigrames generats.\n"
+"            Un dels avantatges de la cerca de trigrames és que una cerca d "
+"\"entrepà\" trobarà paraules mal escrites com \"entepà\" que es perdrien per "
+"altres mètodes.\n"
+"            "
 
 #: .\cookbook\templates\search_info.html:69
 msgid "Search Fields"
@@ -1687,6 +1746,38 @@ msgid ""
 "full text results, it does match the trigram results.\n"
 "            "
 msgstr ""
+" \n"
+"            Unaccent és un cas especial perquè permet cercar un camp \"sense "
+"accent\" per a cada estil de cerca intentant ignorar els valors accentuats. "
+"\n"
+"            Per exemple, quan activeu sense accent per a \"poma\", qualsevol "
+"cerca (comença per, conté, trigrama) intentarà la cerca ignorant els "
+"caràcters accentuats.\n"
+"            \n"
+"            Per a la resta d'opcions, podeu habilitar la cerca en qualsevol "
+"o tots els camps i es combinaran juntament amb un assumpte 'OR'.\n"
+"            Per exemple, activar \"Nom\" per a Comença per, \"Nom\" i "
+"\"Descripció\" per a la concordança parcial i \"Ingredients\" i \"Paraules "
+"clau\" per a la cerca completa\n"
+"            i cercant \"poma\" generarà una cerca que retornarà les receptes "
+"que tenen:\n"
+"            - El nom de la recepta comença amb \"poma\"\n"
+"            - O bé una recepta que conté \"poma\"\n"
+"            - O bé una descripció de la recepta que conté \"poma\"\n"
+"            - O bé una recepta que contingui una recepta que tindrà una "
+"coincidència de cerca de text complet ('poma' o 'pomes') als ingredients.\n"
+"            - O bé una recepta que coincideix amb el text complet a les "
+"paraules clau\n"
+"\n"
+"            Combinar massa camps en massa tipus de cerca pot tenir un "
+"impacte negatiu en el rendiment, crear resultats duplicats o retornar "
+"resultats inesperats.\n"
+"            Per exemple, activar la cerca difusa o les coincidències "
+"parcials interferirà amb els mètodes de cerca web.  \n"
+"            Si cerqueu \"tarta de poma\" amb la cerca difusa i la cerca de "
+"text complet, es tornarà la recepta Tarta de poma. Tot i que no s'inclou als "
+"resultats del text complet, coincideix amb els resultats del trigrama.\n"
+"            "
 
 #: .\cookbook\templates\search_info.html:95
 msgid "Search Index"
@@ -1704,6 +1795,15 @@ msgid ""
 "the management command 'python manage.py rebuildindex'\n"
 "            "
 msgstr ""
+" \n"
+"            La cerca amb trigram i la cerca de text complet es basen en l’"
+"índex de bases de dades per operar de manera eficaç.  \n"
+"            Podeu reconstruir els índexs de tots els camps de la pàgina d’"
+"administració de receptes, seleccionant totes les receptes i realitzant l’"
+"acció “Reconstruir l’índex per a la recepta seleccionada”.\n"
+"            També podeu reconstruir els índexs de la línia de comandaments "
+"executant el la comanda 'Python Manage.py RebuildIndex'\n"
+"            "
 
 #: .\cookbook\templates\settings.html:25
 msgid ""
@@ -1813,6 +1913,8 @@ msgid ""
 "You can sign in to your account using any of the following third party\n"
 "            accounts:"
 msgstr ""
+"Pots accedir al teu compte mitjançant qualsevol dels  \n"
+"               comptes de tercers següents:"
 
 #: .\cookbook\templates\socialaccount\connections.html:52
 msgid ""
@@ -1831,26 +1933,27 @@ msgstr "Registre"
 #: .\cookbook\templates\socialaccount\login.html:9
 #, python-format
 msgid "Connect %(provider)s"
-msgstr ""
+msgstr "Connectar %(provider)s"
 
 #: .\cookbook\templates\socialaccount\login.html:11
 #, python-format
 msgid "You are about to connect a new third party account from %(provider)s."
-msgstr ""
+msgstr "Estàs a punt de connectar un nou compte de tercers per a %(provider)s."
 
 #: .\cookbook\templates\socialaccount\login.html:13
 #, python-format
 msgid "Sign In Via %(provider)s"
-msgstr ""
+msgstr "Connectar via %(provider)s"
 
 #: .\cookbook\templates\socialaccount\login.html:15
 #, python-format
 msgid "You are about to sign in using a third party account from %(provider)s."
 msgstr ""
+"Estàs a punt de connectar fent servir un compte de tercers de %(provider)s."
 
 #: .\cookbook\templates\socialaccount\login.html:20
 msgid "Continue"
-msgstr ""
+msgstr "Continuar"
 
 #: .\cookbook\templates\socialaccount\signup.html:10
 #, python-format
@@ -1859,6 +1962,10 @@ msgid ""
 "        %(provider_name)s account to login to\n"
 "        %(site_name)s. As a final step, please complete the following form:"
 msgstr ""
+"Estàs a punt d'utilitzar el teu \n"
+"        %(provider_name)s compte per connectar a \n"
+"        %(site_name)s. Per a finalitzar, si us plau completa el següent "
+"formulari:"
 
 #: .\cookbook\templates\socialaccount\snippets\provider_list.html:23
 #: .\cookbook\templates\socialaccount\snippets\provider_list.html:31
@@ -1912,7 +2019,7 @@ msgstr "Pots ser convidat a un espai existent o crear el teu propi."
 
 #: .\cookbook\templates\space_overview.html:53
 msgid "Owner"
-msgstr ""
+msgstr "Propietari"
 
 #: .\cookbook\templates\space_overview.html:57
 #, fuzzy
@@ -1979,6 +2086,11 @@ msgid ""
 "script to generate version information (done automatically in docker).\n"
 "        "
 msgstr ""
+"\n"
+"            Necessites executar <code>version.py</code> al teu script "
+"d'actualització per generar informació de la versió (feta automàticament a "
+"Docker).\n"
+"        "
 
 #: .\cookbook\templates\system.html:46
 msgid "Media Serving"
@@ -2064,7 +2176,7 @@ msgstr ""
 
 #: .\cookbook\templates\system.html:86
 msgid "Allowed Hosts"
-msgstr ""
+msgstr "Allotjaments permesos"
 
 #: .\cookbook\templates\system.html:90
 msgid ""

cookbook/locale/es/LC_MESSAGES/django.po

@@ -14,8 +14,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-01 15:04+0200\n"
-"PO-Revision-Date: 2024-03-27 19:02+0000\n"
-"Last-Translator: Axel Breiterman <axelbreiterman@gmail.com>\n"
+"PO-Revision-Date: 2025-01-29 13:44+0000\n"
+"Last-Translator: Ángel <1024mb@users.noreply.translate.tandoor.dev>\n"
 "Language-Team: Spanish <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/es/>\n"
 "Language: es\n"
@@ -23,7 +23,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 5.4.2\n"
+"X-Generator: Weblate 5.8.4\n"
 
 #: .\cookbook\forms.py:45
 msgid ""
@@ -66,31 +66,30 @@ msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
 msgstr ""
-"Para evitar duplicados, las recetas con el mismo nombre serán ignoradas. "
-"Marca esta opción para importar todas las recetas."
+"Para evitar duplicados, las recetas con el mismo nombre que las ya "
+"existentes serán ignoradas. Marca esta casilla para importar todo."
 
 #: .\cookbook\forms.py:143
 msgid "Add your comment: "
-msgstr "Añada su comentario: "
+msgstr "Añade tu comentario: "
 
 #: .\cookbook\forms.py:151
 msgid "Leave empty for dropbox and enter app password for nextcloud."
 msgstr ""
-"Déjelo vacío para Dropbox e ingrese la contraseña de la aplicación para "
-"nextcloud."
+"Déjalo vacío para Dropbox o ingresa la contraseña de la aplicación para "
+"Nextcloud."
 
 #: .\cookbook\forms.py:154
 msgid "Leave empty for nextcloud and enter api token for dropbox."
-msgstr ""
-"Déjelo en blanco para nextcloud e ingrese el token de api para dropbox."
+msgstr "Déjalo vacío para Nextcloud o ingresa el token API para Dropbox."
 
 #: .\cookbook\forms.py:160
 msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
 msgstr ""
-"Dejar vació para Dropbox e introducir sólo la URL base para Nextcloud "
-"(<code>/remote.php/webdav/</code> se añade automáticamente)"
+"Déjalo vacío para Dropbox o ingresa solo la URL base para Nextcloud "
+"(<code>/remote.php/webdav/</code> es añadido automáticamente)"
 
 #: .\cookbook\forms.py:188
 msgid ""
@@ -98,15 +97,16 @@ msgid ""
 "profile\">Long Lived Access Token</a> for your HomeAssistant instance"
 msgstr ""
 "<a href=\"https://www.home-assistant.io/docs/authentication/#your-account-"
-"profile\">Token de larga duración</a>para tu instancia de HomeAssistant"
+"profile\">Token de acceso de larga duración</a> para tu instancia de "
+"HomeAssistant"
 
 #: .\cookbook\forms.py:193
 msgid "Something like http://homeassistant.local:8123/api"
-msgstr "Algo similar a http://homeassistant.local:8123/api"
+msgstr "Algo como http://homeassistant.local:8123/api"
 
 #: .\cookbook\forms.py:205
 msgid "http://homeassistant.local:8123/api for example"
-msgstr "por ejemplo http://homeassistant.local:8123/api for example"
+msgstr "Por ejemplo http://homeassistant.local:8123/api"
 
 #: .\cookbook\forms.py:222 .\cookbook\views\edit.py:117
 msgid "Storage"

cookbook/locale/fr/LC_MESSAGES/django.po

@@ -14,16 +14,16 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-01 15:04+0200\n"
-"PO-Revision-Date: 2024-05-28 00:57+0000\n"
-"Last-Translator: tarek EL SOL <tarek.elsol@gmail.com>\n"
-"Language-Team: French <http://translate.tandoor.dev/projects/tandoor/recipes-"
-"backend/fr/>\n"
+"PO-Revision-Date: 2025-02-16 14:58+0000\n"
+"Last-Translator: Elvis Gosselin <elvis.gosselin@tutanota.com>\n"
+"Language-Team: French <http://translate.tandoor.dev/projects/tandoor/"
+"recipes-backend/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.4.2\n"
+"X-Generator: Weblate 5.8.4\n"
 
 #: .\cookbook\forms.py:45
 msgid ""
@@ -506,18 +506,16 @@ msgid "Nutrition"
 msgstr "Informations nutritionnelles"
 
 #: .\cookbook\models.py:918
-#, fuzzy
-#| msgid "Merge"
 msgid "Allergen"
-msgstr "Fusionner"
+msgstr "Allergène"
 
 #: .\cookbook\models.py:919
 msgid "Price"
-msgstr ""
+msgstr "Prix"
 
 #: .\cookbook\models.py:919
 msgid "Goal"
-msgstr ""
+msgstr "Objectif"
 
 #: .\cookbook\models.py:1408 .\cookbook\templates\search_info.html:28
 msgid "Simple"
@@ -1039,7 +1037,7 @@ msgstr "Exporter"
 
 #: .\cookbook\templates\base.html:287
 msgid "Properties"
-msgstr ""
+msgstr "Propriétés"
 
 #: .\cookbook\templates\base.html:301 .\cookbook\views\lists.py:255
 #, fuzzy
@@ -2112,6 +2110,11 @@ msgid ""
 "script to generate version information (done automatically in docker).\n"
 "        "
 msgstr ""
+"\n"
+"            Vous devez exécuter <code>version.py</code> dans votre script de "
+"mise à jour pour générer les informations de version (automatique avec "
+"docker).\n"
+"        "
 
 #: .\cookbook\templates\system.html:46
 msgid "Media Serving"
@@ -2199,7 +2202,7 @@ msgstr ""
 
 #: .\cookbook\templates\system.html:86
 msgid "Allowed Hosts"
-msgstr ""
+msgstr "Hôtes autorisés"
 
 #: .\cookbook\templates\system.html:90
 msgid ""
@@ -2209,6 +2212,11 @@ msgid ""
 "this.\n"
 "        "
 msgstr ""
+"\n"
+"            Votre configuration autorise tous les hôtes, cela  ok dans "
+"certaines installations mais  évité. Veuillez consulter les documentations à "
+"ce sujet.\n"
+"        "
 
 #: .\cookbook\templates\system.html:97
 msgid "Database"
@@ -2235,18 +2243,26 @@ msgid ""
 "issue.\n"
 "        "
 msgstr ""
+"\n"
+"            Les migrations de données ne devraient jamais échouer!\n"
+"            Les échecs de migrations vont causer des problèmes de "
+"fonctionnement majeurs dans l’application..\n"
+"            Si une migration échoue, vérifiez que vous êtes sur la dernière "
+"version et si c'est le cas veuillez créer un ticket sur GitHub avec le "
+"contenu du journal de migration.\n"
+"        "
 
 #: .\cookbook\templates\system.html:182
 msgid "False"
-msgstr ""
+msgstr "Faux"
 
 #: .\cookbook\templates\system.html:182
 msgid "True"
-msgstr ""
+msgstr "Vrai"
 
 #: .\cookbook\templates\system.html:207
 msgid "Hide"
-msgstr ""
+msgstr "Cacher"
 
 #: .\cookbook\templates\system.html:210
 #, fuzzy
@@ -2328,11 +2344,13 @@ msgstr "{obj.name} a été ajouté(e) à la liste de courses."
 
 #: .\cookbook\views\api.py:742
 msgid "Filter meal plans from date (inclusive) in the format of YYYY-MM-DD."
-msgstr ""
+msgstr "Filtrer les repas depuis la date (incluse) avec le format YYYY-MM-DD."
 
 #: .\cookbook\views\api.py:743
 msgid "Filter meal plans to date (inclusive) in the format of YYYY-MM-DD."
 msgstr ""
+"Filtrer les plannings de repas depuis la date (incluse) avec le format YYYY-"
+"MM-DD."
 
 #: .\cookbook\views\api.py:744
 #, fuzzy

cookbook/locale/he/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-01 15:04+0200\n"
-"PO-Revision-Date: 2024-09-08 12:58+0000\n"
-"Last-Translator: Tomer Alcavi <alcavi1991@gmail.com>\n"
+"PO-Revision-Date: 2025-03-07 15:08+0000\n"
+"Last-Translator: yonatan ben-menachem <2bmyonatan@gmail.com>\n"
 "Language-Team: Hebrew <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/he/>\n"
 "Language: he\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n == 1) ? 0 : ((n == 2) ? 1 : ((n > 10 && "
 "n % 10 == 0) ? 2 : 3));\n"
-"X-Generator: Weblate 5.6.2\n"
+"X-Generator: Weblate 5.8.4\n"
 
 #: .\cookbook\forms.py:45
 msgid ""
@@ -59,6 +59,8 @@ msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
 msgstr ""
+"בשביל למנוע כפילויות, מתוכנים בעלי שם זהה למתכון קיים לא יעובדו. סמן כאן כדי "
+"לייבא בכל זאת."
 
 #: .\cookbook\forms.py:143
 msgid "Add your comment: "

cookbook/locale/hr/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-01 15:04+0200\n"
-"PO-Revision-Date: 2024-11-19 06:58+0000\n"
-"Last-Translator: Daniel Legin <daniel.legin@gmail.com>\n"
+"PO-Revision-Date: 2025-02-03 16:58+0000\n"
+"Last-Translator: Domagoj Levanić <levanicdomagoj@gmail.com>\n"
 "Language-Team: Croatian <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/hr/>\n"
 "Language: hr\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 5.6.2\n"
+"X-Generator: Weblate 5.8.4\n"
 
 #: .\cookbook\forms.py:45
 msgid ""
@@ -757,11 +757,15 @@ msgid ""
 "for user %(user_display)s\n"
 "            ."
 msgstr ""
+"Molimo potvrdite da je\n"
+"            <a href=\"mailto:%(email)s\">%(email)s</a> e-mail adresa "
+"korisnika %(user_display)s\n"
+"            ."
 
 #: .\cookbook\templates\account\email_confirm.html:22
 #: .\cookbook\templates\generic\delete_template.html:72
 msgid "Confirm"
-msgstr ""
+msgstr "Potvrdi"
 
 #: .\cookbook\templates\account\email_confirm.html:29
 #, python-format
@@ -770,11 +774,14 @@ msgid ""
 "            <a href=\"%(email_url)s\">issue a new e-mail confirmation "
 "request</a>."
 msgstr ""
+"Poveznica za potvrdu e-maila je istekla ili nevažeća. Molimo\n"
+"            <a href=\"%(email_url)s\">zatražite slanje nove poveznice za "
+"potvrdu e-maila.</a>."
 
 #: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:388
 #: .\cookbook\templates\openid\login.html:8
 msgid "Login"
-msgstr ""
+msgstr "Prijava"
 
 #: .\cookbook\templates\account\login.html:15
 #: .\cookbook\templates\account\login.html:31
@@ -786,7 +793,7 @@ msgstr ""
 #: .\cookbook\templates\openid\login.html:26
 #: .\cookbook\templates\socialaccount\authentication_error.html:15
 msgid "Sign In"
-msgstr ""
+msgstr "Prijava"
 
 #: .\cookbook\templates\account\login.html:34
 #: .\cookbook\templates\account\password_reset.html:41
@@ -794,34 +801,34 @@ msgstr ""
 #: .\cookbook\templates\socialaccount\signup.html:8
 #: .\cookbook\templates\socialaccount\signup.html:57
 msgid "Sign Up"
-msgstr ""
+msgstr "Registracija"
 
 #: .\cookbook\templates\account\login.html:38
 msgid "Lost your password?"
-msgstr ""
+msgstr "Zaboravljena lozinka?"
 
 #: .\cookbook\templates\account\login.html:39
 #: .\cookbook\templates\account\password_reset.html:29
 msgid "Reset My Password"
-msgstr ""
+msgstr "Resetiraj moju lozinku"
 
 #: .\cookbook\templates\account\login.html:50
 msgid "Social Login"
-msgstr ""
+msgstr "Prijava putem društvenih mreža"
 
 #: .\cookbook\templates\account\login.html:51
 msgid "You can use any of the following providers to sign in."
-msgstr ""
+msgstr "Možete koristiti bilo kojeg od sljedećih pružatelja usluga za prijavu."
 
 #: .\cookbook\templates\account\logout.html:5
 #: .\cookbook\templates\account\logout.html:9
 #: .\cookbook\templates\account\logout.html:18
 msgid "Sign Out"
-msgstr ""
+msgstr "Odjava"
 
 #: .\cookbook\templates\account\logout.html:11
 msgid "Are you sure you want to sign out?"
-msgstr ""
+msgstr "Jeste li sigurni da se želite odjaviti?"
 
 #: .\cookbook\templates\account\password_change.html:6
 #: .\cookbook\templates\account\password_change.html:16
@@ -831,43 +838,47 @@ msgstr ""
 #: .\cookbook\templates\account\password_reset_from_key_done.html:7
 #: .\cookbook\templates\account\password_reset_from_key_done.html:13
 msgid "Change Password"
-msgstr ""
+msgstr "Promijeni lozinku"
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
 msgid "Password"
-msgstr ""
+msgstr "Lozinka"
 
 #: .\cookbook\templates\account\password_change.html:22
 msgid "Forgot Password?"
-msgstr ""
+msgstr "Zaboravljena lozinka?"
 
 #: .\cookbook\templates\account\password_reset.html:7
 #: .\cookbook\templates\account\password_reset.html:13
 #: .\cookbook\templates\account\password_reset_done.html:7
 #: .\cookbook\templates\account\password_reset_done.html:18
 msgid "Password Reset"
-msgstr ""
+msgstr "Ponovno postavljanje lozinke"
 
 #: .\cookbook\templates\account\password_reset.html:24
 msgid ""
 "Forgotten your password? Enter your e-mail address below, and we'll send you "
 "an e-mail allowing you to reset it."
 msgstr ""
+"Zaboravili ste lozinku? Unesite svoju e-mail adresu u nastavku i poslat ćemo "
+"vam e-mail s poveznicom za postavljanje nove lozinke."
 
 #: .\cookbook\templates\account\password_reset.html:32
 msgid "Password reset is disabled on this instance."
-msgstr ""
+msgstr "Reset lozinke nije omogućen na ovoj instanci."
 
 #: .\cookbook\templates\account\password_reset_done.html:25
 msgid ""
 "We have sent you an e-mail. Please contact us if you do not receive it "
 "within a few minutes."
 msgstr ""
+"Poslali smo vam e-mail. Molimo vas da nas kontaktirate ako ga ne primite u "
+"roku od nekoliko minuta."
 
 #: .\cookbook\templates\account\password_reset_from_key.html:13
 msgid "Bad Token"
-msgstr ""
+msgstr "Nevažeći token"
 
 #: .\cookbook\templates\account\password_reset_from_key.html:25
 #, python-format
@@ -877,225 +888,231 @@ msgid ""
 "                    Please request a <a href=\"%(passwd_reset_url)s\">new "
 "password reset</a>."
 msgstr ""
+"Poveznica za reset lozinke je nevažeća, vjerojatno jer je već iskorištena.\n"
+"                    Molimo zatražite <a href=\"%(passwd_reset_url)s\">novu "
+"poveznicu za reset lozinke</a>."
 
 #: .\cookbook\templates\account\password_reset_from_key.html:33
 msgid "change password"
-msgstr ""
+msgstr "promijeni lozinku"
 
 #: .\cookbook\templates\account\password_reset_from_key.html:36
 #: .\cookbook\templates\account\password_reset_from_key_done.html:19
 msgid "Your password is now changed."
-msgstr ""
+msgstr "Tvoja lozinka je promijenjena."
 
 #: .\cookbook\templates\account\password_set.html:6
 #: .\cookbook\templates\account\password_set.html:16
 #: .\cookbook\templates\account\password_set.html:21
 msgid "Set Password"
-msgstr ""
+msgstr "Postavi lozinku"
 
 #: .\cookbook\templates\account\signup.html:6
 msgid "Register"
-msgstr ""
+msgstr "Registracija"
 
 #: .\cookbook\templates\account\signup.html:12
 msgid "Create an Account"
-msgstr ""
+msgstr "Kreiraj račun"
 
 #: .\cookbook\templates\account\signup.html:42
 #: .\cookbook\templates\socialaccount\signup.html:33
 msgid "I accept the follwoing"
-msgstr ""
+msgstr "Prihvaćam sljedeće"
 
 #: .\cookbook\templates\account\signup.html:45
 #: .\cookbook\templates\socialaccount\signup.html:36
 msgid "Terms and Conditions"
-msgstr ""
+msgstr "Uvjeti i odredbe"
 
 #: .\cookbook\templates\account\signup.html:48
 #: .\cookbook\templates\socialaccount\signup.html:39
 msgid "and"
-msgstr ""
+msgstr "i"
 
 #: .\cookbook\templates\account\signup.html:52
 #: .\cookbook\templates\socialaccount\signup.html:43
 msgid "Privacy Policy"
-msgstr ""
+msgstr "Politika privatnosti"
 
 #: .\cookbook\templates\account\signup.html:65
 msgid "Create User"
-msgstr ""
+msgstr "Kreiraj korisnika"
 
 #: .\cookbook\templates\account\signup.html:69
 msgid "Already have an account?"
-msgstr ""
+msgstr "Već imate račun?"
 
 #: .\cookbook\templates\account\signup_closed.html:5
 #: .\cookbook\templates\account\signup_closed.html:11
 msgid "Sign Up Closed"
-msgstr ""
+msgstr "Registracija je zatvorena"
 
 #: .\cookbook\templates\account\signup_closed.html:13
 msgid "We are sorry, but the sign up is currently closed."
-msgstr ""
+msgstr "Žao nam je, ali registracija je trenutno zatvorena."
 
 #: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:378
 #: .\cookbook\templates\rest_framework\api.html:11
 msgid "API Documentation"
-msgstr ""
+msgstr "API Dokumentacija"
 
 #: .\cookbook\templates\base.html:110 .\cookbook\templates\index.html:87
 msgid "Recipes"
-msgstr ""
+msgstr "Recepti"
 
 #: .\cookbook\templates\base.html:161 .\cookbook\views\lists.py:120
 msgid "Foods"
-msgstr ""
+msgstr "Hrana"
 
 #: .\cookbook\templates\base.html:173 .\cookbook\views\lists.py:137
 msgid "Units"
-msgstr ""
+msgstr "Jedinice"
 
 #: .\cookbook\templates\base.html:187
 msgid "Supermarket"
-msgstr ""
+msgstr "Supermarket"
 
 #: .\cookbook\templates\base.html:199
 msgid "Supermarket Category"
-msgstr ""
+msgstr "Kategorija Supermarketa"
 
 #: .\cookbook\templates\base.html:211 .\cookbook\views\lists.py:186
 msgid "Automations"
-msgstr ""
+msgstr "Automatizacije"
 
 #: .\cookbook\templates\base.html:225 .\cookbook\views\lists.py:222
 msgid "Files"
-msgstr ""
+msgstr "Datoteke"
 
 #: .\cookbook\templates\base.html:237
 msgid "Batch Edit"
-msgstr ""
+msgstr "Masovno Uređivanje"
 
 #: .\cookbook\templates\base.html:249 .\cookbook\templates\history.html:6
 #: .\cookbook\templates\history.html:14
 msgid "History"
-msgstr ""
+msgstr "Povijest"
 
 #: .\cookbook\templates\base.html:263
 #: .\cookbook\templates\ingredient_editor.html:7
 #: .\cookbook\templates\ingredient_editor.html:13
 msgid "Ingredient Editor"
-msgstr ""
+msgstr "Uređivač Sastojaka"
 
 #: .\cookbook\templates\base.html:275
 #: .\cookbook\templates\export_response.html:7
 #: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
 msgid "Export"
-msgstr ""
+msgstr "Izvoz"
 
 #: .\cookbook\templates\base.html:287
 msgid "Properties"
-msgstr ""
+msgstr "Svojstva"
 
 #: .\cookbook\templates\base.html:301 .\cookbook\views\lists.py:255
 msgid "Unit Conversions"
-msgstr ""
+msgstr "Konverzija Jedinica"
 
 #: .\cookbook\templates\base.html:318 .\cookbook\templates\index.html:47
 msgid "Import Recipe"
-msgstr ""
+msgstr "Uvezi Recept"
 
 #: .\cookbook\templates\base.html:320
 msgid "Create"
-msgstr ""
+msgstr "Kreiraj"
 
 #: .\cookbook\templates\base.html:333
 #: .\cookbook\templates\generic\list_template.html:14
 msgid "External Recipes"
-msgstr ""
+msgstr "Vanjski Recepti"
 
 #: .\cookbook\templates\base.html:336 .\cookbook\templates\space_manage.html:15
 msgid "Space Settings"
-msgstr ""
+msgstr "Postavke Prostora"
 
 #: .\cookbook\templates\base.html:340
 msgid "External Connectors"
-msgstr ""
+msgstr "Vanjski Konektori"
 
 #: .\cookbook\templates\base.html:345 .\cookbook\templates\system.html:13
 msgid "System"
-msgstr ""
+msgstr "Sustav"
 
 #: .\cookbook\templates\base.html:347
 msgid "Admin"
-msgstr ""
+msgstr "Administrator"
 
 #: .\cookbook\templates\base.html:351
 #: .\cookbook\templates\space_overview.html:25
 msgid "Your Spaces"
-msgstr ""
+msgstr "Tvoji Prostori"
 
 #: .\cookbook\templates\base.html:362
 #: .\cookbook\templates\space_overview.html:6
 msgid "Overview"
-msgstr ""
+msgstr "Pregled"
 
 #: .\cookbook\templates\base.html:372
 msgid "Markdown Guide"
-msgstr ""
+msgstr "Vodič za Markdown"
 
 #: .\cookbook\templates\base.html:374
 msgid "GitHub"
-msgstr ""
+msgstr "GitHub"
 
 #: .\cookbook\templates\base.html:376
 msgid "Translate Tandoor"
-msgstr ""
+msgstr "Prevedi Tandoor"
 
 #: .\cookbook\templates\base.html:380
 msgid "API Browser"
-msgstr ""
+msgstr "API Preglednik"
 
 #: .\cookbook\templates\base.html:383
 msgid "Log out"
-msgstr ""
+msgstr "Odjava"
 
 #: .\cookbook\templates\base.html:406
 msgid "You are using the free version of Tandor"
-msgstr ""
+msgstr "Koristite besplatnu verziju Tandor aplikacije"
 
 #: .\cookbook\templates\base.html:407
 msgid "Upgrade Now"
-msgstr ""
+msgstr "Nadogradi"
 
 #: .\cookbook\templates\batch\edit.html:6
 msgid "Batch edit Category"
-msgstr ""
+msgstr "Masovno uređivanje Kategorija"
 
 #: .\cookbook\templates\batch\edit.html:15
 msgid "Batch edit Recipes"
-msgstr ""
+msgstr "Masovno uređivanje Recepata"
 
 #: .\cookbook\templates\batch\edit.html:20
 msgid "Add the specified keywords to all recipes containing a word"
 msgstr ""
+"Dodajte navedene ključne riječi svim receptima koji sadrže određenu riječ"
 
 #: .\cookbook\templates\batch\monitor.html:6 .\cookbook\views\edit.py:75
 msgid "Sync"
-msgstr ""
+msgstr "Sinkroniziraj"
 
 #: .\cookbook\templates\batch\monitor.html:10
 msgid "Manage watched Folders"
-msgstr ""
+msgstr "Upravljaj praćenim Mapama"
 
 #: .\cookbook\templates\batch\monitor.html:14
 msgid ""
 "On this Page you can manage all storage folder locations that should be "
 "monitored and synced."
 msgstr ""
+"Na ovoj stranici možete upravljati svim lokacijama spremišnih mapa koje "
+"trebaju biti praćene i sinkronizirane."
 
 #: .\cookbook\templates\batch\monitor.html:16
 msgid "The path must be in the following format"
-msgstr ""
+msgstr "Putanja mora biti u sljedećem formatu"
 
 #: .\cookbook\templates\batch\monitor.html:20
 #: .\cookbook\templates\forms\edit_import_recipe.html:14
@@ -1103,128 +1120,130 @@ msgstr ""
 #: .\cookbook\templates\generic\new_template.html:23
 #: .\cookbook\templates\settings.html:57
 msgid "Save"
-msgstr ""
+msgstr "Spremi"
 
 #: .\cookbook\templates\batch\monitor.html:21
 msgid "Manage External Storage"
-msgstr ""
+msgstr "Upravljaj vanjskim Spremištem"
 
 #: .\cookbook\templates\batch\monitor.html:28
 msgid "Sync Now!"
-msgstr ""
+msgstr "Sinkroniziraj Sada!"
 
 #: .\cookbook\templates\batch\monitor.html:29
 msgid "Show Recipes"
-msgstr ""
+msgstr "Prikaži Recepte"
 
 #: .\cookbook\templates\batch\monitor.html:30
 msgid "Show Log"
-msgstr ""
+msgstr "Prikaži Log"
 
 #: .\cookbook\templates\batch\waiting.html:4
 #: .\cookbook\templates\batch\waiting.html:10
 msgid "Importing Recipes"
-msgstr ""
+msgstr "Uvoz Recepata"
 
 #: .\cookbook\templates\batch\waiting.html:28
 msgid ""
 "This can take a few minutes, depending on the number of recipes in sync, "
 "please wait."
 msgstr ""
+"Ovo može potrajati nekoliko minuta, ovisno o broju recepata koji se "
+"sinkroniziraju, molimo pričekajte."
 
 #: .\cookbook\templates\books.html:7
 msgid "Recipe Books"
-msgstr ""
+msgstr "Knjiga Recepata"
 
 #: .\cookbook\templates\export.html:7 .\cookbook\templates\test2.html:6
 msgid "Export Recipes"
-msgstr ""
+msgstr "Izvoz Recepata"
 
 #: .\cookbook\templates\forms\edit_import_recipe.html:5
 #: .\cookbook\templates\forms\edit_import_recipe.html:9
 msgid "Import new Recipe"
-msgstr ""
+msgstr "Uvezi novi Recept"
 
 #: .\cookbook\templates\forms\edit_internal_recipe.html:7
 msgid "Edit Recipe"
-msgstr ""
+msgstr "Uredi Recept"
 
 #: .\cookbook\templates\generic\delete_template.html:21
 #, python-format
 msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
-msgstr ""
+msgstr "Jeste li sigurni da želite obrisati %(title)s: <b>%(object)s</b> "
 
 #: .\cookbook\templates\generic\delete_template.html:22
 msgid "This cannot be undone!"
-msgstr ""
+msgstr "Ovo se ne može poništiti!"
 
 #: .\cookbook\templates\generic\delete_template.html:27
 msgid "Protected"
-msgstr ""
+msgstr "Zaštićeno"
 
 #: .\cookbook\templates\generic\delete_template.html:42
 msgid "Cascade"
-msgstr ""
+msgstr "Kaskada"
 
 #: .\cookbook\templates\generic\delete_template.html:73
 msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
 
 #: .\cookbook\templates\generic\edit_template.html:6
 #: .\cookbook\templates\generic\edit_template.html:14
 msgid "Edit"
-msgstr ""
+msgstr "Uredi"
 
 #: .\cookbook\templates\generic\edit_template.html:32
 msgid "View"
-msgstr ""
+msgstr "Pogledaj"
 
 #: .\cookbook\templates\generic\edit_template.html:36
 msgid "Delete original file"
-msgstr ""
+msgstr "Izbriši izvornu datoteku"
 
 #: .\cookbook\templates\generic\list_template.html:6
 #: .\cookbook\templates\generic\list_template.html:22
 msgid "List"
-msgstr ""
+msgstr "Lista"
 
 #: .\cookbook\templates\generic\list_template.html:36
 msgid "Filter"
-msgstr ""
+msgstr "Filter"
 
 #: .\cookbook\templates\generic\list_template.html:41
 msgid "Import all"
-msgstr ""
+msgstr "Uvezi sve"
 
 #: .\cookbook\templates\generic\new_template.html:6
 #: .\cookbook\templates\generic\new_template.html:14
 msgid "New"
-msgstr ""
+msgstr "Novo"
 
 #: .\cookbook\templates\generic\table_template.html:76
 msgid "previous"
-msgstr ""
+msgstr "prethodno"
 
 #: .\cookbook\templates\generic\table_template.html:98
 msgid "next"
-msgstr ""
+msgstr "sljedeće"
 
 #: .\cookbook\templates\history.html:20
 msgid "View Log"
-msgstr ""
+msgstr "Pogledaj Log"
 
 #: .\cookbook\templates\history.html:24
 msgid "Cook Log"
-msgstr ""
+msgstr "Log Kuhanja"
 
 #: .\cookbook\templates\import_response.html:7 .\cookbook\views\delete.py:90
 #: .\cookbook\views\edit.py:174
 msgid "Import"
-msgstr ""
+msgstr "Uvezi"
 
 #: .\cookbook\templates\include\storage_backend_warning.html:4
 msgid "Security Warning"
-msgstr ""
+msgstr "Sigurnosno Upozorenje"
 
 #: .\cookbook\templates\include\storage_backend_warning.html:5
 msgid ""
@@ -1238,35 +1257,44 @@ msgid ""
 "can be used.\n"
 "    "
 msgstr ""
+"\n"
+"        <b>Lozinka i token</b> polja su spremljena kao <b>obični tekst</b> "
+"unutar baze podataka.\n"
+"        To je neophodno s obzirom na to da su potrebni za izvršavanje API "
+"zahtjeva, ali isto tako povećava \n"
+"        rizik od krađe. <br/>\n"
+"        Kako bi limitirali potencijalnu štetu u tom slučaju, predlažemo "
+"korištenje tokena ili računa s limitiranim pristupom.\n"
+"    "
 
 #: .\cookbook\templates\index.html:29
 msgid "Search recipe ..."
-msgstr ""
+msgstr "Pretraži recept..."
 
 #: .\cookbook\templates\index.html:44
 msgid "New Recipe"
-msgstr ""
+msgstr "Novi Recept"
 
 #: .\cookbook\templates\index.html:53
 msgid "Advanced Search"
-msgstr ""
+msgstr "Napredno Pretraživanje"
 
 #: .\cookbook\templates\index.html:57
 msgid "Reset Search"
-msgstr ""
+msgstr "Resetiraj Pretraživanje"
 
 #: .\cookbook\templates\index.html:85
 msgid "Last viewed"
-msgstr ""
+msgstr "Zadnji put pregledano"
 
 #: .\cookbook\templates\index.html:94
 msgid "Log in to view recipes"
-msgstr ""
+msgstr "Prijavi se kako bi vidio recepte"
 
 #: .\cookbook\templates\markdown_info.html:5
 #: .\cookbook\templates\markdown_info.html:13
 msgid "Markdown Info"
-msgstr ""
+msgstr "Informacije o Markdown-u"
 
 #: .\cookbook\templates\markdown_info.html:14
 msgid ""
@@ -1283,34 +1311,46 @@ msgid ""
 "below.\n"
 "    "
 msgstr ""
+"\n"
+"        Markdown je lagani jezik za označavanje koji se može koristiti za "
+"jednostavno formatiranje običnog teksta.\n"
+"Ova stranica koristi <a href=\"https://python-markdown.github.io/\" target="
+"\"_blank\">Python Markdown</a> biblioteku za\n"
+"pretvaranje vašeg teksta u lijepi HTML. Potpunu dokumentaciju za Markdown "
+"možete pronaći\n"
+"<a href=\"https://daringfireball.net/projects/markdown/syntax\" target="
+"\"_blank\">ovdje</a>.\n"
+"Nepotpuna, ali vjerojatno dovoljna dokumentacija može se pronaći u nastavku."
+"\n"
+"    "
 
 #: .\cookbook\templates\markdown_info.html:25
 msgid "Headers"
-msgstr ""
+msgstr "Naslovi"
 
 #: .\cookbook\templates\markdown_info.html:54
 msgid "Formatting"
-msgstr ""
+msgstr "Formatiranje"
 
 #: .\cookbook\templates\markdown_info.html:56
 #: .\cookbook\templates\markdown_info.html:72
 msgid "Line breaks are inserted by adding two spaces after the end of a line"
-msgstr ""
+msgstr "Prekid linije se može umetnuti dodavanjem dva razmaka nakon kraja retka"
 
 #: .\cookbook\templates\markdown_info.html:57
 #: .\cookbook\templates\markdown_info.html:73
 msgid "or by leaving a blank line in between."
-msgstr ""
+msgstr "ili ostavljanjem prazne linije između."
 
 #: .\cookbook\templates\markdown_info.html:59
 #: .\cookbook\templates\markdown_info.html:74
 msgid "This text is bold"
-msgstr ""
+msgstr "Ovaj tekst je boldan"
 
 #: .\cookbook\templates\markdown_info.html:60
 #: .\cookbook\templates\markdown_info.html:75
 msgid "This text is italic"
-msgstr ""
+msgstr "Ovaj tekst je italic"
 
 #: .\cookbook\templates\markdown_info.html:61
 #: .\cookbook\templates\markdown_info.html:77

cookbook/locale/nb_NO/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-01 15:04+0200\n"
-"PO-Revision-Date: 2023-08-19 21:36+0000\n"
-"Last-Translator: NeoID <neoid@animenord.com>\n"
+"PO-Revision-Date: 2025-01-26 05:58+0000\n"
+"Last-Translator: Ole Martin Ruud <nett@barskern.no>\n"
 "Language-Team: Norwegian Bokmål <http://translate.tandoor.dev/projects/"
 "tandoor/recipes-backend/nb_NO/>\n"
 "Language: nb_NO\n"
@@ -17,7 +17,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.15\n"
+"X-Generator: Weblate 5.8.4\n"
 
 #: .\cookbook\forms.py:45
 msgid ""
@@ -326,10 +326,8 @@ msgid "Imported %s recipes."
 msgstr "Importerte %s oppskrifter."
 
 #: .\cookbook\integration\openeats.py:28
-#, fuzzy
-#| msgid "Recipes"
 msgid "Recipe source:"
-msgstr "Oppskrifter"
+msgstr "Oppskriftskilde:"
 
 #: .\cookbook\integration\paprika.py:49
 msgid "Notes"
@@ -555,7 +553,7 @@ msgstr "Oppskrift"
 
 #: .\cookbook\models.py:1504
 msgid "Food"
-msgstr ""
+msgstr "Mat"
 
 #: .\cookbook\models.py:1505 .\cookbook\templates\base.html:149
 msgid "Keyword"
@@ -846,10 +844,8 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\templates\account\password_reset.html:32
-#, fuzzy
-#| msgid "Password reset is not implemented for the time being!"
 msgid "Password reset is disabled on this instance."
-msgstr "Det er foreløpig ikke implementert funksjon for å nullstille passord!"
+msgstr "Nullstilling av passord er skrudd av for denne instansen."
 
 #: .\cookbook\templates\account\password_reset_done.html:25
 msgid ""
@@ -912,7 +908,7 @@ msgstr ""
 #: .\cookbook\templates\account\signup.html:48
 #: .\cookbook\templates\socialaccount\signup.html:39
 msgid "and"
-msgstr ""
+msgstr "og"
 
 #: .\cookbook\templates\account\signup.html:52
 #: .\cookbook\templates\socialaccount\signup.html:43
@@ -946,8 +942,6 @@ msgid "Recipes"
 msgstr "Oppskrifter"
 
 #: .\cookbook\templates\base.html:161 .\cookbook\views\lists.py:120
-#, fuzzy
-#| msgid "New Food"
 msgid "Foods"
 msgstr "Ny matvare"
 
@@ -989,10 +983,8 @@ msgstr "Historikk"
 #: .\cookbook\templates\base.html:263
 #: .\cookbook\templates\ingredient_editor.html:7
 #: .\cookbook\templates\ingredient_editor.html:13
-#, fuzzy
-#| msgid "Ingredients"
 msgid "Ingredient Editor"
-msgstr "Ingredienser"
+msgstr "Ingrediensredigerer"
 
 #: .\cookbook\templates\base.html:275
 #: .\cookbook\templates\export_response.html:7
@@ -1002,7 +994,7 @@ msgstr "Eksporter"
 
 #: .\cookbook\templates\base.html:287
 msgid "Properties"
-msgstr ""
+msgstr "Egenskaper"
 
 #: .\cookbook\templates\base.html:301 .\cookbook\views\lists.py:255
 msgid "Unit Conversions"
@@ -1179,7 +1171,7 @@ msgstr ""
 
 #: .\cookbook\templates\generic\delete_template.html:27
 msgid "Protected"
-msgstr ""
+msgstr "Beskyttet"
 
 #: .\cookbook\templates\generic\delete_template.html:42
 msgid "Cascade"
@@ -1938,7 +1930,7 @@ msgstr ""
 #: .\cookbook\templates\system.html:75 .\cookbook\templates\system.html:88
 #: .\cookbook\templates\system.html:102 .\cookbook\templates\system.html:113
 msgid "Warning"
-msgstr ""
+msgstr "Advarsel"
 
 #: .\cookbook\templates\system.html:47 .\cookbook\templates\system.html:61
 #: .\cookbook\templates\system.html:75 .\cookbook\templates\system.html:88

cookbook/locale/nl/LC_MESSAGES/django.po

@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-01 15:04+0200\n"
-"PO-Revision-Date: 2024-09-03 19:58+0000\n"
-"Last-Translator: \"S. v.d. Gevel\" <stefan18_gw@hotmail.com>\n"
+"PO-Revision-Date: 2025-02-16 14:58+0000\n"
+"Last-Translator: Cots Partier <cots.pastier.34@icloud.com>\n"
 "Language-Team: Dutch <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/nl/>\n"
 "Language: nl\n"
@@ -22,7 +22,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 5.6.2\n"
+"X-Generator: Weblate 5.8.4\n"
 
 #: .\cookbook\forms.py:45
 msgid ""
@@ -286,7 +286,7 @@ msgstr "omgekeerde rotatie"
 
 #: .\cookbook\helper\recipe_url_import.py:311
 msgid "careful rotation"
-msgstr "voorzichtige rotatie"
+msgstr "rotire atentă"
 
 #: .\cookbook\helper\recipe_url_import.py:312
 msgid "knead"

cookbook/locale/pl/LC_MESSAGES/django.po

@@ -11,18 +11,18 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-01 15:04+0200\n"
-"PO-Revision-Date: 2024-03-19 23:47+0000\n"
-"Last-Translator: Tomasz Klimczak <klemensble@gmail.com>\n"
-"Language-Team: Polish <http://translate.tandoor.dev/projects/tandoor/recipes-"
-"backend/pl/>\n"
+"PO-Revision-Date: 2025-01-26 05:58+0000\n"
+"Last-Translator: Dominik Ruczajewski <slick.moose.dev@gmail.com>\n"
+"Language-Team: Polish <http://translate.tandoor.dev/projects/tandoor/"
+"recipes-backend/pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n"
-"%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
-"%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
-"X-Generator: Weblate 5.4.2\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && ("
+"n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && "
+"n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"X-Generator: Weblate 5.8.4\n"
 
 #: .\cookbook\forms.py:45
 msgid ""
@@ -65,6 +65,8 @@ msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
 msgstr ""
+"Aby zapobiec duplikatom, przepisy o tej samej nazwie co istniejące zostaną "
+"pominięte. Zaznacz to pole, aby zaimportować wszystko."
 
 #: .\cookbook\forms.py:143
 msgid "Add your comment: "
@@ -91,14 +93,16 @@ msgid ""
 "<a href=\"https://www.home-assistant.io/docs/authentication/#your-account-"
 "profile\">Long Lived Access Token</a> for your HomeAssistant instance"
 msgstr ""
+"<a href=\"https://www.home-assistant.io/docs/authentication/#your-account-"
+"profile\">Long Lived Access Token</a> dla Twojej instancji Home Assistant"
 
 #: .\cookbook\forms.py:193
 msgid "Something like http://homeassistant.local:8123/api"
-msgstr ""
+msgstr "Coś w stylu http://homeassistant.local:8123/api"
 
 #: .\cookbook\forms.py:205
 msgid "http://homeassistant.local:8123/api for example"
-msgstr ""
+msgstr "na przykład http://homeassistant.local:8123/api"
 
 #: .\cookbook\forms.py:222 .\cookbook\views\edit.py:117
 msgid "Storage"
@@ -106,11 +110,11 @@ msgstr "Magazyn"
 
 #: .\cookbook\forms.py:222
 msgid "Active"
-msgstr ""
+msgstr "Aktywuj"
 
 #: .\cookbook\forms.py:226
 msgid "Search String"
-msgstr "Wyszukaj ciąg"
+msgstr "Wyszukaj tekst"
 
 #: .\cookbook\forms.py:246
 msgid "File ID"
@@ -118,101 +122,117 @@ msgstr "Numer identyfikacyjny pliku"
 
 #: .\cookbook\forms.py:262
 msgid "Maximum number of users for this space reached."
-msgstr ""
+msgstr "Osiągnięto maksymalną liczbę użytkowników dla tej przestrzeni."
 
 #: .\cookbook\forms.py:268
 msgid "Email address already taken!"
-msgstr ""
+msgstr "Wybrany adres email jest już zajęty!"
 
 #: .\cookbook\forms.py:275
 msgid ""
 "An email address is not required but if present the invite link will be sent "
 "to the user."
 msgstr ""
+"Adres email nie jest wymagany, jednak gdy zostanie podany link z "
+"zaproszeniem zostanie wysłany do użytkownika."
 
 #: .\cookbook\forms.py:287
 msgid "Name already taken."
-msgstr ""
+msgstr "Podana nazwa jest już zajęta."
 
 #: .\cookbook\forms.py:298
 msgid "Accept Terms and Privacy"
-msgstr ""
+msgstr "Zaakceptuj Regulamin oraz Politykę Prywatności"
 
 #: .\cookbook\forms.py:332
 msgid ""
 "Determines how fuzzy a search is if it uses trigram similarity matching (e."
 "g. low values mean more typos are ignored)."
 msgstr ""
+"Określa, jak niedokładne może być wyszukiwanie, jeśli wykorzystuje "
+"dopasowanie podobieństwa trigramowego (np. niskie wartości oznaczają, że "
+"więcej literówek jest ignorowanych)."
 
 #: .\cookbook\forms.py:340
 msgid ""
 "Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
 "full description of choices."
 msgstr ""
+"Wybierz metodę wyszukiwania. Kliknij <a href=\"/docs/search/\">tutaj</a>, "
+"aby zapoznać się z pełnym opisem dostępnych opcji."
 
 #: .\cookbook\forms.py:341
 msgid ""
 "Use fuzzy matching on units, keywords and ingredients when editing and "
 "importing recipes."
 msgstr ""
+"Użyj niedokładnego dopasowywania dla jednostek, słów kluczowych i składników "
+"podczas edytowania i importowania przepisów."
 
 #: .\cookbook\forms.py:342
 msgid ""
 "Fields to search ignoring accents.  Selecting this option can improve or "
 "degrade search quality depending on language"
 msgstr ""
+"Pola do przeszukiwania z pominięciem akcentów. Wybranie tej opcji może "
+"poprawić lub pogorszyć jakość wyszukiwania w zależności od języka"
 
 #: .\cookbook\forms.py:343
 msgid ""
 "Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
 "'pie' and 'piece' and 'soapie')"
 msgstr ""
+"Pola do przeszukiwania częściowych dopasowań (np. wyszukiwanie 'Ciasto' "
+"zwróci 'ciasto', 'ciasteczko' i 'ciastolina')"
 
 #: .\cookbook\forms.py:344
 msgid ""
 "Fields to search for beginning of word matches. (e.g. searching for 'sa' "
 "will return 'salad' and 'sandwich')"
 msgstr ""
+"Pola do przeszukiwania dopasowań na początku wyrazu (np. wyszukiwanie 'sa' "
+"zwróci 'sałatka' i 'sandwich')"
 
 #: .\cookbook\forms.py:345
 msgid ""
 "Fields to 'fuzzy' search. (e.g. searching for 'recpie' will find 'recipe'.)  "
 "Note: this option will conflict with 'web' and 'raw' methods of search."
 msgstr ""
+"Pola do wyszukiwania z użyciem 'niedokładnego' dopasowywania (np. "
+"wyszukiwanie 'przepisz' znajdzie 'przepis'). Uwaga: ta opcja będzie "
+"kolidować z metodami wyszukiwania 'web' i 'raw'."
 
 #: .\cookbook\forms.py:346
 msgid ""
 "Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
 "only function with fulltext fields."
 msgstr ""
+"Pola do wyszukiwania pełno tekstowego. Uwaga: metody wyszukiwania 'web', "
+"'phrase' i 'raw' działają wyłącznie z polami pełno tekstowymi."
 
 #: .\cookbook\forms.py:350
-#, fuzzy
-#| msgid "Search"
 msgid "Search Method"
-msgstr "Szukaj"
+msgstr "Metoda wyszukiwania"
 
 #: .\cookbook\forms.py:350
 msgid "Fuzzy Lookups"
-msgstr ""
+msgstr "Niedokładne dopasowanie"
 
 #: .\cookbook\forms.py:350
 msgid "Ignore Accent"
-msgstr ""
+msgstr "Ignoruj akcenty"
 
 #: .\cookbook\forms.py:350
 msgid "Partial Match"
-msgstr ""
+msgstr "Częściowe dopasowanie"
 
 #: .\cookbook\forms.py:350
 msgid "Starts With"
-msgstr ""
+msgstr "Zaczyna się od"
 
 #: .\cookbook\forms.py:351
-#, fuzzy
-#| msgid "Search"
 msgid "Fuzzy Search"
-msgstr "Szukaj"
+msgstr "Niedokładne wyszukiwanie"
 
 #: .\cookbook\forms.py:351
 #, fuzzy
@@ -225,6 +245,8 @@ msgid ""
 "In order to prevent spam, the requested email was not send. Please wait a "
 "few minutes and try again."
 msgstr ""
+"Aby zapobiec spamowi, żądany e-mail nie został wysłany. Proszę poczekać "
+"kilka minut i spróbować ponownie."
 
 #: .\cookbook\helper\permission_helper.py:164
 #: .\cookbook\helper\permission_helper.py:187 .\cookbook\views\views.py:117
@@ -255,57 +277,57 @@ msgstr ""
 
 #: .\cookbook\helper\permission_helper.py:402
 msgid "You have reached the maximum number of recipes for your space."
-msgstr ""
+msgstr "Osiągnąłeś maksymalną liczbę przepisów dla swojej przestrzeni."
 
 #: .\cookbook\helper\permission_helper.py:414
 msgid "You have more users than allowed in your space."
-msgstr ""
+msgstr "Masz więcej użytkowników, niż jest dozwolone w Twojej przestrzeni."
 
 #: .\cookbook\helper\recipe_url_import.py:310
 msgid "reverse rotation"
-msgstr ""
+msgstr "rotacja wsteczna"
 
 #: .\cookbook\helper\recipe_url_import.py:311
 msgid "careful rotation"
-msgstr ""
+msgstr "delikatna rotacja"
 
 #: .\cookbook\helper\recipe_url_import.py:312
 msgid "knead"
-msgstr ""
+msgstr "zagnieść"
 
 #: .\cookbook\helper\recipe_url_import.py:313
 msgid "thicken"
-msgstr ""
+msgstr "zagęścić"
 
 #: .\cookbook\helper\recipe_url_import.py:314
 msgid "warm up"
-msgstr ""
+msgstr "podgrzać"
 
 #: .\cookbook\helper\recipe_url_import.py:315
 msgid "ferment"
-msgstr ""
+msgstr "doprowadzić do wrzenia"
 
 #: .\cookbook\helper\recipe_url_import.py:316
 msgid "sous-vide"
-msgstr ""
+msgstr "gotować w próżni"
 
 #: .\cookbook\helper\shopping_helper.py:150
 msgid "You must supply a servings size"
-msgstr ""
+msgstr "Musisz podać wielkość porcji"
 
 #: .\cookbook\helper\template_helper.py:95
 #: .\cookbook\helper\template_helper.py:97
 msgid "Could not parse template code."
-msgstr ""
+msgstr "Nie można przeanalizować kodu szablonu."
 
 #: .\cookbook\integration\copymethat.py:44
 #: .\cookbook\integration\melarecipes.py:37
 msgid "Favorite"
-msgstr ""
+msgstr "Ulubione"
 
 #: .\cookbook\integration\copymethat.py:50
 msgid "I made this"
-msgstr ""
+msgstr "Stworzyłem to"
 
 #: .\cookbook\integration\integration.py:209
 msgid ""
@@ -320,10 +342,12 @@ msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
 msgstr ""
+"Wystąpił nieoczekiwany błąd podczas importu. Upewnij się, że przesłałeś "
+"prawidłowy plik."
 
 #: .\cookbook\integration\integration.py:217
 msgid "The following recipes were ignored because they already existed:"
-msgstr ""
+msgstr "Następujące przepisy zostały pominięte, ponieważ już istnieją:"
 
 #: .\cookbook\integration\integration.py:221
 #, python-format
@@ -341,14 +365,12 @@ msgid "Notes"
 msgstr "Notatka"
 
 #: .\cookbook\integration\paprika.py:52
-#, fuzzy
-#| msgid "Information"
 msgid "Nutritional Information"
-msgstr "Informacja"
+msgstr "Informacje o wartości odżywczej"
 
 #: .\cookbook\integration\paprika.py:56
 msgid "Source"
-msgstr ""
+msgstr "Źródło"
 
 #: .\cookbook\integration\recettetek.py:54
 #: .\cookbook\integration\recipekeeper.py:70
@@ -377,23 +399,25 @@ msgstr "Sekcja"
 
 #: .\cookbook\management\commands\fix_duplicate_properties.py:15
 msgid "Fixes foods with "
-msgstr ""
+msgstr "Poprawia potrawy z "
 
 #: .\cookbook\management\commands\rebuildindex.py:14
 msgid "Rebuilds full text search index on Recipe"
-msgstr ""
+msgstr "Odbudowuje indeks wyszukiwania pełno tekstowego dla przepisu"
 
 #: .\cookbook\management\commands\rebuildindex.py:18
 msgid "Only Postgresql databases use full text search, no index to rebuild"
 msgstr ""
+"Pełno tekstowe wyszukiwanie jest używane tylko w bazach danych PostgreSQL, "
+"brak indeksu do odbudowy"
 
 #: .\cookbook\management\commands\rebuildindex.py:29
 msgid "Recipe index rebuild complete."
-msgstr ""
+msgstr "Odbudowa indeksu przepisu zakończona."
 
 #: .\cookbook\management\commands\rebuildindex.py:31
 msgid "Recipe index rebuild failed."
-msgstr ""
+msgstr "Odbudowa indeksu przepisu nie powiodła się."
 
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:14
 msgid "Breakfast"
@@ -412,8 +436,6 @@ msgid "Other"
 msgstr "Inne"
 
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:17
-#, fuzzy
-#| msgid "Fats"
 msgid "Fat"
 msgstr "Tłuszcze"
 
@@ -421,7 +443,7 @@ msgstr "Tłuszcze"
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:18
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:19
 msgid "g"
-msgstr ""
+msgstr "g"
 
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:18
 msgid "Carbohydrates"
@@ -437,13 +459,15 @@ msgstr "Kalorie"
 
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:20
 msgid "kcal"
-msgstr ""
+msgstr "kcal"
 
 #: .\cookbook\models.py:325
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
 msgstr ""
+"Maksymalna pojemność na pliki dla przestrzeni w MB. 0 oznacza brak limitu, -"
+"1 wyłącza możliwość przesyłania plików."
 
 #: .\cookbook\models.py:454 .\cookbook\templates\search.html:7
 #: .\cookbook\templates\settings.html:18

cookbook/locale/pt/LC_MESSAGES/django.po

@@ -12,8 +12,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-01 15:04+0200\n"
-"PO-Revision-Date: 2023-10-07 18:02+0000\n"
-"Last-Translator: Guilherme Roda <glealroda@gmail.com>\n"
+"PO-Revision-Date: 2025-02-21 10:58+0000\n"
+"Last-Translator: Filipe Neves <homemdasneves@gmail.com>\n"
 "Language-Team: Portuguese <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/pt/>\n"
 "Language: pt\n"
@@ -21,7 +21,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.15\n"
+"X-Generator: Weblate 5.8.4\n"
 
 #: .\cookbook\forms.py:45
 msgid ""
@@ -94,14 +94,16 @@ msgid ""
 "<a href=\"https://www.home-assistant.io/docs/authentication/#your-account-"
 "profile\">Long Lived Access Token</a> for your HomeAssistant instance"
 msgstr ""
+"<a href=\"https://www.home-assistant.io/docs/authentication/#your-account-"
+"profile\">Token de longa duração</a>para a sua instância HomeAssistant"
 
 #: .\cookbook\forms.py:193
 msgid "Something like http://homeassistant.local:8123/api"
-msgstr ""
+msgstr "Algo como http://homeassistant.local:8123/api"
 
 #: .\cookbook\forms.py:205
 msgid "http://homeassistant.local:8123/api for example"
-msgstr ""
+msgstr "http://homeassistant.local:8123/api por exemplo"
 
 #: .\cookbook\forms.py:222 .\cookbook\views\edit.py:117
 msgid "Storage"
@@ -181,18 +183,25 @@ msgid ""
 "Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
 "'pie' and 'piece' and 'soapie')"
 msgstr ""
+"Campos a pesquisar por correspondência. (Ex: pesquisar por 'mor' retorna "
+"'morango' e 'amora')"
 
 #: .\cookbook\forms.py:344
 msgid ""
 "Fields to search for beginning of word matches. (e.g. searching for 'sa' "
 "will return 'salad' and 'sandwich')"
 msgstr ""
+"Campos a pesquisar para correspondências no início da palavra. (por exemplo, "
+"pesquisar por \"sa\" retornará \"salada\" e \"sanduíche\")"
 
 #: .\cookbook\forms.py:345
 msgid ""
 "Fields to 'fuzzy' search. (e.g. searching for 'recpie' will find 'recipe'.)  "
 "Note: this option will conflict with 'web' and 'raw' methods of search."
 msgstr ""
+"Campos para pesquisa aproximada. (por exemplo, pesquisar por \"recita\" "
+"encontrará \"receita\"). Nota: esta opção entra em conflito com os métodos "
+"de pesquisa \"web\" e \"raw\"."
 
 #: .\cookbook\forms.py:346
 msgid ""
@@ -206,19 +215,19 @@ msgstr "Método de Pesquisa"
 
 #: .\cookbook\forms.py:350
 msgid "Fuzzy Lookups"
-msgstr ""
+msgstr "Pesquisas Aproximadas"
 
 #: .\cookbook\forms.py:350
 msgid "Ignore Accent"
-msgstr ""
+msgstr "Ignorar pronúncia"
 
 #: .\cookbook\forms.py:350
 msgid "Partial Match"
-msgstr ""
+msgstr "Correspondência parcial"
 
 #: .\cookbook\forms.py:350
 msgid "Starts With"
-msgstr ""
+msgstr "Começa com"
 
 #: .\cookbook\forms.py:351
 msgid "Fuzzy Search"
@@ -233,6 +242,8 @@ msgid ""
 "In order to prevent spam, the requested email was not send. Please wait a "
 "few minutes and try again."
 msgstr ""
+"Para evitar spam, o email solicitado não foi enviado. Por favor, aguarde "
+"alguns minutos e tente novamente."
 
 #: .\cookbook\helper\permission_helper.py:164
 #: .\cookbook\helper\permission_helper.py:187 .\cookbook\views\views.py:117
@@ -257,11 +268,11 @@ msgstr "Sem permissões para aceder a esta página!"
 #: .\cookbook\helper\permission_helper.py:237
 #: .\cookbook\helper\permission_helper.py:252
 msgid "You cannot interact with this object as it is not owned by you!"
-msgstr ""
+msgstr "Não pode interagir com este objeto, pois não é seu!"
 
 #: .\cookbook\helper\permission_helper.py:402
 msgid "You have reached the maximum number of recipes for your space."
-msgstr ""
+msgstr "Atingiu o número máximo de receitas para o seu espaço."
 
 #: .\cookbook\helper\permission_helper.py:414
 msgid "You have more users than allowed in your space."

cookbook/locale/pt_BR/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-01 15:04+0200\n"
-"PO-Revision-Date: 2023-10-09 01:54+0000\n"
-"Last-Translator: Guilherme Roda <glealroda@gmail.com>\n"
+"PO-Revision-Date: 2025-03-13 22:58+0000\n"
+"Last-Translator: Jader Moraes <jader-ms@hotmail.com>\n"
 "Language-Team: Portuguese (Brazil) <http://translate.tandoor.dev/projects/"
 "tandoor/recipes-backend/pt_BR/>\n"
 "Language: pt_BR\n"
@@ -17,15 +17,15 @@ 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.15\n"
+"X-Generator: Weblate 5.8.4\n"
 
 #: .\cookbook\forms.py:45
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
 msgstr ""
-"Ambos os campos são opcionais. Se nenhum for preenchido o nome do usuário "
-"será mostrado"
+"Ambos os campos são opcionais. Se nenhum for preenchido, o login será "
+"mostrado"
 
 #: .\cookbook\forms.py:62 .\cookbook\forms.py:246
 msgid "Name"
@@ -88,14 +88,16 @@ msgid ""
 "<a href=\"https://www.home-assistant.io/docs/authentication/#your-account-"
 "profile\">Long Lived Access Token</a> for your HomeAssistant instance"
 msgstr ""
+"<a href=\"https://www.home-assistant.io/docs/authentication/#your-account-"
+"profile\">Token de longa duração</a> para sua instância do HomeAssistant"
 
 #: .\cookbook\forms.py:193
 msgid "Something like http://homeassistant.local:8123/api"
-msgstr ""
+msgstr "Algo como http://homeassistant.local:8123/api"
 
 #: .\cookbook\forms.py:205
 msgid "http://homeassistant.local:8123/api for example"
-msgstr ""
+msgstr "http://homeassistant.local:8123/api por exemplo"
 
 #: .\cookbook\forms.py:222 .\cookbook\views\edit.py:117
 msgid "Storage"
@@ -142,6 +144,9 @@ msgid ""
 "Determines how fuzzy a search is if it uses trigram similarity matching (e."
 "g. low values mean more typos are ignored)."
 msgstr ""
+"Determina o quão 'difusa' uma pesquisa é se esta utilizando uma "
+"correspondência de semelhança de trigrama (valores mais baixos significam "
+"que mais erros são ignorados)."
 
 #: .\cookbook\forms.py:340
 msgid ""
@@ -172,24 +177,33 @@ msgid ""
 "Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
 "'pie' and 'piece' and 'soapie')"
 msgstr ""
+"Campos a serem usados para pesquisa parcial (ex: pesquisar 'Pão' pode "
+"retornar 'pão', 'pãozinho' e 'pão de queijo')"
 
 #: .\cookbook\forms.py:344
 msgid ""
 "Fields to search for beginning of word matches. (e.g. searching for 'sa' "
 "will return 'salad' and 'sandwich')"
 msgstr ""
+"Campos que devem ser buscados para correspondências de prefixo. (por "
+"exemplo, buscar por 'sa' retornará 'salada' e 'sanduíche')"
 
 #: .\cookbook\forms.py:345
 msgid ""
 "Fields to 'fuzzy' search. (e.g. searching for 'recpie' will find 'recipe'.)  "
 "Note: this option will conflict with 'web' and 'raw' methods of search."
 msgstr ""
+"Campos que devem usar busca 'difusa' (fuzzy). (por exemplo, procurando por "
+"'recita' vai encontrar 'receita').  Nota: essa opção conflitará com os "
+"métodos de pesquisa 'web' e 'raw'."
 
 #: .\cookbook\forms.py:346
 msgid ""
 "Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
 "only function with fulltext fields."
 msgstr ""
+"Campos para fazer busca do texto completo.  Nota: 'os métodos de pesquisa "
+"'web', 'frase' e 'raw' funcionam somente com campos de texto completo."
 
 #: .\cookbook\forms.py:350
 msgid "Search Method"
@@ -197,15 +211,15 @@ msgstr "Método de Pesquisa"
 
 #: .\cookbook\forms.py:350
 msgid "Fuzzy Lookups"
-msgstr ""
+msgstr "Buscas 'Difusas' (fuzzy)"
 
 #: .\cookbook\forms.py:350
 msgid "Ignore Accent"
-msgstr ""
+msgstr "Ignorar Acentos"
 
 #: .\cookbook\forms.py:350
 msgid "Partial Match"
-msgstr ""
+msgstr "Correspondência parcial"
 
 #: .\cookbook\forms.py:350
 msgid "Starts With"
@@ -224,6 +238,8 @@ msgid ""
 "In order to prevent spam, the requested email was not send. Please wait a "
 "few minutes and try again."
 msgstr ""
+"Para prevenir spam, o email requisitado não pode ser enviado. Por favor, "
+"aguarde alguns minutos e tente novamente."
 
 #: .\cookbook\helper\permission_helper.py:164
 #: .\cookbook\helper\permission_helper.py:187 .\cookbook\views\views.py:117
@@ -249,44 +265,43 @@ msgstr "Sem permissões para acessar esta página!"
 #: .\cookbook\helper\permission_helper.py:252
 msgid "You cannot interact with this object as it is not owned by you!"
 msgstr ""
+"Você não pode interagir com esse objeto, pois ele não é sua propriedade!"
 
 #: .\cookbook\helper\permission_helper.py:402
 msgid "You have reached the maximum number of recipes for your space."
-msgstr ""
+msgstr "Você alcançou o número limite de receitas para o seu Espaço."
 
 #: .\cookbook\helper\permission_helper.py:414
 msgid "You have more users than allowed in your space."
-msgstr ""
+msgstr "Você tem mais usuários que o permitido em seu Espaço."
 
 #: .\cookbook\helper\recipe_url_import.py:310
-#, fuzzy
-#| msgid "Use fractions"
 msgid "reverse rotation"
-msgstr "Usar frações"
+msgstr "rotação reversa"
 
 #: .\cookbook\helper\recipe_url_import.py:311
 msgid "careful rotation"
-msgstr ""
+msgstr "rotação cuidadosa"
 
 #: .\cookbook\helper\recipe_url_import.py:312
 msgid "knead"
-msgstr ""
+msgstr "amassar"
 
 #: .\cookbook\helper\recipe_url_import.py:313
 msgid "thicken"
-msgstr ""
+msgstr "engrossar"
 
 #: .\cookbook\helper\recipe_url_import.py:314
 msgid "warm up"
-msgstr ""
+msgstr "pré aquecer"
 
 #: .\cookbook\helper\recipe_url_import.py:315
 msgid "ferment"
-msgstr ""
+msgstr "fermentar"
 
 #: .\cookbook\helper\recipe_url_import.py:316
 msgid "sous-vide"
-msgstr ""
+msgstr "sous-vide"
 
 #: .\cookbook\helper\shopping_helper.py:150
 msgid "You must supply a servings size"
@@ -295,32 +310,36 @@ msgstr "Você precisa informar um tamanho de porção"
 #: .\cookbook\helper\template_helper.py:95
 #: .\cookbook\helper\template_helper.py:97
 msgid "Could not parse template code."
-msgstr ""
+msgstr "Não foi possível analisar o código do modelo."
 
 #: .\cookbook\integration\copymethat.py:44
 #: .\cookbook\integration\melarecipes.py:37
 msgid "Favorite"
-msgstr ""
+msgstr "Favorito"
 
 #: .\cookbook\integration\copymethat.py:50
 msgid "I made this"
-msgstr ""
+msgstr "Eu fiz isso"
 
 #: .\cookbook\integration\integration.py:209
 msgid ""
 "Importer expected a .zip file. Did you choose the correct importer type for "
 "your data ?"
 msgstr ""
+"O importador esperava um arquivo .zip. Você escolheu o tipo de importador "
+"correto para os seus dados?"
 
 #: .\cookbook\integration\integration.py:212
 msgid ""
 "An unexpected error occurred during the import. Please make sure you have "
 "uploaded a valid file."
 msgstr ""
+"Um erro inesperado aconteceu durante a importação. Por favor, verifique se "
+"enviou um arquivo válido."
 
 #: .\cookbook\integration\integration.py:217
 msgid "The following recipes were ignored because they already existed:"
-msgstr ""
+msgstr "A seguintes receitas foram ignoradas, pois já existem:"
 
 #: .\cookbook\integration\integration.py:221
 #, python-format
@@ -328,10 +347,8 @@ msgid "Imported %s recipes."
 msgstr "%s receitas importadas."
 
 #: .\cookbook\integration\openeats.py:28
-#, fuzzy
-#| msgid "Recipes"
 msgid "Recipe source:"
-msgstr "Receitas"
+msgstr "Fonte da receita:"
 
 #: .\cookbook\integration\paprika.py:49
 msgid "Notes"
@@ -347,10 +364,8 @@ msgstr "Fonte"
 
 #: .\cookbook\integration\recettetek.py:54
 #: .\cookbook\integration\recipekeeper.py:70
-#, fuzzy
-#| msgid "Import Log"
 msgid "Imported from"
-msgstr "Importar Log"
+msgstr "Importado de"
 
 #: .\cookbook\integration\saffron.py:23
 msgid "Servings"
@@ -374,23 +389,25 @@ msgstr "Seção"
 
 #: .\cookbook\management\commands\fix_duplicate_properties.py:15
 msgid "Fixes foods with "
-msgstr ""
+msgstr "Corrige comidas com "
 
 #: .\cookbook\management\commands\rebuildindex.py:14
 msgid "Rebuilds full text search index on Recipe"
-msgstr ""
+msgstr "Reconstrói o índice de busca de texto por completo da Receita"
 
 #: .\cookbook\management\commands\rebuildindex.py:18
 msgid "Only Postgresql databases use full text search, no index to rebuild"
 msgstr ""
+"Apenas bancos de dados Postgresql utilizam busca por texto completo, não há "
+"índice para reconstruir"
 
 #: .\cookbook\management\commands\rebuildindex.py:29
 msgid "Recipe index rebuild complete."
-msgstr ""
+msgstr "Reconstrução de índice de receita concluído."
 
 #: .\cookbook\management\commands\rebuildindex.py:31
 msgid "Recipe index rebuild failed."
-msgstr ""
+msgstr "Reconstrução de índice de Receita falhou."
 
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:14
 msgid "Breakfast"
@@ -410,35 +427,37 @@ msgstr "Outro"
 
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:17
 msgid "Fat"
-msgstr ""
+msgstr "Gordura"
 
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:17
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:18
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:19
 msgid "g"
-msgstr ""
+msgstr "g"
 
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:18
 msgid "Carbohydrates"
-msgstr ""
+msgstr "Carboidratos"
 
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:19
 msgid "Proteins"
-msgstr ""
+msgstr "Proteínas"
 
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:20
 msgid "Calories"
-msgstr ""
+msgstr "Calorias"
 
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:20
 msgid "kcal"
-msgstr ""
+msgstr "kcal"
 
 #: .\cookbook\models.py:325
 msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
 msgstr ""
+"Limite máximo de armazenamento de arquivos em MB. 0 para ilimitado, −1 para "
+"impedir o envio de arquivos."
 
 #: .\cookbook\models.py:454 .\cookbook\templates\search.html:7
 #: .\cookbook\templates\settings.html:18
@@ -462,27 +481,23 @@ msgstr "Compras"
 
 #: .\cookbook\models.py:752
 msgid " is part of a recipe step and cannot be deleted"
-msgstr ""
+msgstr " é parte de uma etapa de uma receita, e não pode ser excluído"
 
 #: .\cookbook\models.py:918
-#, fuzzy
-#| msgid "Automations"
 msgid "Nutrition"
-msgstr "Automações"
+msgstr "Informações nutricionais"
 
 #: .\cookbook\models.py:918
-#, fuzzy
-#| msgid "Merge"
 msgid "Allergen"
-msgstr "Mesclar"
+msgstr "Alérgenos"
 
 #: .\cookbook\models.py:919
 msgid "Price"
-msgstr ""
+msgstr "Preço"
 
 #: .\cookbook\models.py:919
 msgid "Goal"
-msgstr ""
+msgstr "Meta"
 
 #: .\cookbook\models.py:1408 .\cookbook\templates\search_info.html:28
 msgid "Simple"
@@ -513,42 +528,32 @@ msgid "Keyword Alias"
 msgstr "Apelido da Palavra-chave"
 
 #: .\cookbook\models.py:1470
-#, fuzzy
-#| msgid "Description"
 msgid "Description Replace"
-msgstr "Descrição"
+msgstr "Substituir Descrição"
 
 #: .\cookbook\models.py:1471
-#, fuzzy
-#| msgid "Instructions"
 msgid "Instruction Replace"
-msgstr "Instruções"
+msgstr "Substituir Instruções"
 
 #: .\cookbook\models.py:1472
-#, fuzzy
-#| msgid "Select Unit"
 msgid "Never Unit"
-msgstr "Selecionar Unidade"
+msgstr "Nunca usar como unidade"
 
 #: .\cookbook\models.py:1473
 msgid "Transpose Words"
-msgstr ""
+msgstr "Transpor palavras"
 
 #: .\cookbook\models.py:1474
-#, fuzzy
-#| msgid "Food Alias"
 msgid "Food Replace"
-msgstr "Apelido do Alimento"
+msgstr "Substituir comida"
 
 #: .\cookbook\models.py:1475
-#, fuzzy
-#| msgid "Unit Alias"
 msgid "Unit Replace"
-msgstr "Apelido da Unidade"
+msgstr "Substituir unidade"
 
 #: .\cookbook\models.py:1476
 msgid "Name Replace"
-msgstr ""
+msgstr "Substituir nome"
 
 #: .\cookbook\models.py:1503 .\cookbook\views\delete.py:40
 #: .\cookbook\views\edit.py:210 .\cookbook\views\new.py:39
@@ -556,10 +561,8 @@ msgid "Recipe"
 msgstr "Receita"
 
 #: .\cookbook\models.py:1504
-#, fuzzy
-#| msgid "Foods"
 msgid "Food"
-msgstr "Alimentos"
+msgstr "Comida"
 
 #: .\cookbook\models.py:1505 .\cookbook\templates\base.html:149
 msgid "Keyword"
@@ -567,15 +570,15 @@ msgstr "Palavra-chave"
 
 #: .\cookbook\serializer.py:222
 msgid "File uploads are not enabled for this Space."
-msgstr ""
+msgstr "Envio de arquivos não são permitidos nesse Espaço."
 
 #: .\cookbook\serializer.py:233
 msgid "You have reached your file upload limit."
-msgstr ""
+msgstr "Você alcançou o limite do envio de arquivos."
 
 #: .\cookbook\serializer.py:328
 msgid "Cannot modify Space owner permission."
-msgstr ""
+msgstr "Não é possível modificar as permissões do dono do Espaço."
 
 #: .\cookbook\serializer.py:1270
 msgid "Hello"
@@ -587,56 +590,63 @@ msgstr "Você foi convidado por "
 
 #: .\cookbook\serializer.py:1272
 msgid " to join their Tandoor Recipes space "
-msgstr ""
+msgstr " para se juntar ao Espaço "
 
 #: .\cookbook\serializer.py:1274
 msgid "Click the following link to activate your account: "
-msgstr ""
+msgstr "Clique no seguinte link para ativar a sua conta: "
 
 #: .\cookbook\serializer.py:1276
 msgid ""
 "If the link does not work use the following code to manually join the space: "
 msgstr ""
+"Se o link não funcionar use o seguinte código para manualmente entrar no "
+"Espaço: "
 
 #: .\cookbook\serializer.py:1278
 msgid "The invitation is valid until "
-msgstr ""
+msgstr "O convite é válido até "
 
 #: .\cookbook\serializer.py:1280
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
 msgstr ""
+"Tandoor Recipes é um gerenciador de receitas de código aberto. Visite-nos no "
+"GitHub "
 
 #: .\cookbook\serializer.py:1283
 msgid "Tandoor Recipes Invite"
-msgstr ""
+msgstr "Convite para Tandoor Recipes"
 
 #: .\cookbook\serializer.py:1426
 msgid "Existing shopping list to update"
-msgstr ""
+msgstr "Lista de compras pré-existente que será atualizada"
 
 #: .\cookbook\serializer.py:1428
 msgid ""
 "List of ingredient IDs from the recipe to add, if not provided all "
 "ingredients will be added."
 msgstr ""
+"Lista de IDs de ingredientes da receita para adicionar, se não for "
+"preenchido todos os ingredientes serão adicionados."
 
 #: .\cookbook\serializer.py:1430
 msgid ""
 "Providing a list_recipe ID and servings of 0 will delete that shopping list."
 msgstr ""
+"Preenchendo o list_recipe ID e porções com 0, deletará essa lista de compra."
 
 #: .\cookbook\serializer.py:1439
 msgid "Amount of food to add to the shopping list"
-msgstr ""
+msgstr "Quantidade da comida para adicionar na lista de compras"
 
 #: .\cookbook\serializer.py:1441
 msgid "ID of unit to use for the shopping list"
-msgstr ""
+msgstr "ID de uma unidade para usar na lista de compras"
 
 #: .\cookbook\serializer.py:1443
 msgid "When set to true will delete all food from active shopping lists."
-msgstr ""
+msgstr "Quando ativo, deletará todas as comidas da lista de compra."
 
 #: .\cookbook\tables.py:69 .\cookbook\tables.py:83
 #: .\cookbook\templates\generic\delete_template.html:7
@@ -651,11 +661,11 @@ msgstr "Erro 404"
 
 #: .\cookbook\templates\404.html:18
 msgid "The page you are looking for could not be found."
-msgstr ""
+msgstr "Página não encontrada."
 
 #: .\cookbook\templates\404.html:33
 msgid "Take me Home"
-msgstr ""
+msgstr "Leve-me pra Home Page"
 
 #: .\cookbook\templates\404.html:35
 msgid "Report a Bug"
@@ -682,7 +692,7 @@ msgstr "Email"
 
 #: .\cookbook\templates\account\email.html:19
 msgid "The following e-mail addresses are associated with your account:"
-msgstr ""
+msgstr "os e-mails seguintes estão associados com sua conta:"
 
 #: .\cookbook\templates\account\email.html:36
 msgid "Verified"
@@ -719,6 +729,8 @@ msgid ""
 "You currently do not have any e-mail address set up. You should really add "
 "an e-mail address so you can receive notifications, reset your password, etc."
 msgstr ""
+"Você atualmente não possui nenhum e-mail cadastrado. Você deveria adicionar "
+"um e-mail para poder receber notificações, ressetar seu password, etc."
 
 #: .\cookbook\templates\account\email.html:64
 msgid "Add E-mail Address"
@@ -730,7 +742,7 @@ msgstr "Incluir E-mail"
 
 #: .\cookbook\templates\account\email.html:79
 msgid "Do you really want to remove the selected e-mail address?"
-msgstr ""
+msgstr "Você tem certeza que deseja remover o e-mail selecionado?"
 
 #: .\cookbook\templates\account\email_confirm.html:6
 #: .\cookbook\templates\account\email_confirm.html:10
@@ -745,6 +757,10 @@ msgid ""
 "for user %(user_display)s\n"
 "            ."
 msgstr ""
+"Por favor, confirme que\n"
+"            <a href=\"mailto:%(email)s\">%(email)s</a> é um endereço de e-"
+"mail do usuário %(user_display)s\n"
+"            ."
 
 #: .\cookbook\templates\account\email_confirm.html:22
 #: .\cookbook\templates\generic\delete_template.html:72
@@ -758,6 +774,8 @@ msgid ""
 "            <a href=\"%(email_url)s\">issue a new e-mail confirmation "
 "request</a>."
 msgstr ""
+"Link de confirmação de e-mail expirado ou inválido. Por favor\n"
+"<a href=\"%(email_url)s\">enviar um novo pedido de confirmação de e-mail</a>"
 
 #: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:388
 #: .\cookbook\templates\openid\login.html:8
@@ -774,7 +792,7 @@ msgstr "Login"
 #: .\cookbook\templates\openid\login.html:26
 #: .\cookbook\templates\socialaccount\authentication_error.html:15
 msgid "Sign In"
-msgstr ""
+msgstr "Entrar"
 
 #: .\cookbook\templates\account\login.html:34
 #: .\cookbook\templates\account\password_reset.html:41
@@ -782,7 +800,7 @@ msgstr ""
 #: .\cookbook\templates\socialaccount\signup.html:8
 #: .\cookbook\templates\socialaccount\signup.html:57
 msgid "Sign Up"
-msgstr ""
+msgstr "Cadastrar"
 
 #: .\cookbook\templates\account\login.html:38
 msgid "Lost your password?"
@@ -795,21 +813,21 @@ msgstr "Resetar Minha Senha"
 
 #: .\cookbook\templates\account\login.html:50
 msgid "Social Login"
-msgstr ""
+msgstr "Entre com Rede Social"
 
 #: .\cookbook\templates\account\login.html:51
 msgid "You can use any of the following providers to sign in."
-msgstr ""
+msgstr "Você pode utilizar qualquer dos seguintes providers para logar-se."
 
 #: .\cookbook\templates\account\logout.html:5
 #: .\cookbook\templates\account\logout.html:9
 #: .\cookbook\templates\account\logout.html:18
 msgid "Sign Out"
-msgstr ""
+msgstr "Sair (Log Out)"
 
 #: .\cookbook\templates\account\logout.html:11
 msgid "Are you sure you want to sign out?"
-msgstr ""
+msgstr "Você tem certeza que deseja sair?"
 
 #: .\cookbook\templates\account\password_change.html:6
 #: .\cookbook\templates\account\password_change.html:16
@@ -842,20 +860,24 @@ msgid ""
 "Forgotten your password? Enter your e-mail address below, and we'll send you "
 "an e-mail allowing you to reset it."
 msgstr ""
+"Perdeu sua senha? Entre com seu e-mail abaixo e enviaremos instruções de "
+"como reseta-la."
 
 #: .\cookbook\templates\account\password_reset.html:32
 msgid "Password reset is disabled on this instance."
-msgstr ""
+msgstr "Recuperação de senha está desabilitada nessa instância."
 
 #: .\cookbook\templates\account\password_reset_done.html:25
 msgid ""
 "We have sent you an e-mail. Please contact us if you do not receive it "
 "within a few minutes."
 msgstr ""
+"Nós enviamos um e-mail. Por favor, entre em contato se não o receber dentro "
+"de alguns minutos."
 
 #: .\cookbook\templates\account\password_reset_from_key.html:13
 msgid "Bad Token"
-msgstr ""
+msgstr "Token Inválido"
 
 #: .\cookbook\templates\account\password_reset_from_key.html:25
 #, python-format
@@ -920,11 +942,11 @@ msgstr "Já possui uma conta?"
 #: .\cookbook\templates\account\signup_closed.html:5
 #: .\cookbook\templates\account\signup_closed.html:11
 msgid "Sign Up Closed"
-msgstr ""
+msgstr "O cadastro está desabilitado"
 
 #: .\cookbook\templates\account\signup_closed.html:13
 msgid "We are sorry, but the sign up is currently closed."
-msgstr ""
+msgstr "Desculpe, login não está disponível no momento."
 
 #: .\cookbook\templates\api_info.html:5 .\cookbook\templates\base.html:378
 #: .\cookbook\templates\rest_framework\api.html:11
@@ -984,13 +1006,11 @@ msgstr "Exportar"
 
 #: .\cookbook\templates\base.html:287
 msgid "Properties"
-msgstr ""
+msgstr "Propriedades"
 
 #: .\cookbook\templates\base.html:301 .\cookbook\views\lists.py:255
-#, fuzzy
-#| msgid "Account Connections"
 msgid "Unit Conversions"
-msgstr "Conexões de Conta"
+msgstr "Conversões de Medidas"
 
 #: .\cookbook\templates\base.html:318 .\cookbook\templates\index.html:47
 msgid "Import Recipe"
@@ -1010,10 +1030,8 @@ msgid "Space Settings"
 msgstr "Configurar Espaço"
 
 #: .\cookbook\templates\base.html:340
-#, fuzzy
-#| msgid "External Recipes"
 msgid "External Connectors"
-msgstr "Receitas Externas"
+msgstr "Conexões externas"
 
 #: .\cookbook\templates\base.html:345 .\cookbook\templates\system.html:13
 msgid "System"
@@ -1025,19 +1043,17 @@ msgstr "Admin"
 
 #: .\cookbook\templates\base.html:351
 #: .\cookbook\templates\space_overview.html:25
-#, fuzzy
-#| msgid "No Space"
 msgid "Your Spaces"
-msgstr "Sem Espaço"
+msgstr "Seu Espaço"
 
 #: .\cookbook\templates\base.html:362
 #: .\cookbook\templates\space_overview.html:6
 msgid "Overview"
-msgstr ""
+msgstr "Resumo"
 
 #: .\cookbook\templates\base.html:372
 msgid "Markdown Guide"
-msgstr ""
+msgstr "Guia de linguágem Markdown"
 
 #: .\cookbook\templates\base.html:374
 msgid "GitHub"
@@ -1057,11 +1073,11 @@ msgstr "Logout"
 
 #: .\cookbook\templates\base.html:406
 msgid "You are using the free version of Tandor"
-msgstr ""
+msgstr "Você está utilizando a versão gratúita de Tandor"
 
 #: .\cookbook\templates\base.html:407
 msgid "Upgrade Now"
-msgstr ""
+msgstr "Compre Já"
 
 #: .\cookbook\templates\batch\edit.html:6
 msgid "Batch edit Category"
@@ -1088,6 +1104,8 @@ msgid ""
 "On this Page you can manage all storage folder locations that should be "
 "monitored and synced."
 msgstr ""
+"Nessa página, você pode configurar todo os lugares de armazenamento que "
+"devem ser monitorados e sincronizados."
 
 #: .\cookbook\templates\batch\monitor.html:16
 msgid "The path must be in the following format"
@@ -1154,7 +1172,7 @@ msgstr "Tem certeza que deseja apagar %(title)s: <b>%(object)s</b> "
 
 #: .\cookbook\templates\generic\delete_template.html:22
 msgid "This cannot be undone!"
-msgstr ""
+msgstr "Essa ação não pode ser desfeita!"
 
 #: .\cookbook\templates\generic\delete_template.html:27
 msgid "Protected"
@@ -1162,7 +1180,7 @@ msgstr "Protegido"
 
 #: .\cookbook\templates\generic\delete_template.html:42
 msgid "Cascade"
-msgstr ""
+msgstr "Cascata"
 
 #: .\cookbook\templates\generic\delete_template.html:73
 msgid "Cancel"
@@ -1213,7 +1231,7 @@ msgstr "Mostrar Log"
 
 #: .\cookbook\templates\history.html:24
 msgid "Cook Log"
-msgstr ""
+msgstr "Histórico de cocção"
 
 #: .\cookbook\templates\import_response.html:7 .\cookbook\views\delete.py:90
 #: .\cookbook\views\edit.py:174
@@ -1259,7 +1277,7 @@ msgstr "Último visualizado"
 
 #: .\cookbook\templates\index.html:94
 msgid "Log in to view recipes"
-msgstr ""
+msgstr "Faça Login para ver as receitas"
 
 #: .\cookbook\templates\markdown_info.html:5
 #: .\cookbook\templates\markdown_info.html:13
@@ -1314,7 +1332,7 @@ msgstr "Este texto está em itálico"
 #: .\cookbook\templates\markdown_info.html:61
 #: .\cookbook\templates\markdown_info.html:77
 msgid "Blockquotes are also possible"
-msgstr ""
+msgstr "Citação em bloco também é permitido"
 
 #: .\cookbook\templates\markdown_info.html:84
 msgid "Lists"
@@ -1365,11 +1383,13 @@ msgid ""
 "Links can be formatted with Markdown. This application also allows to paste "
 "links directly into markdown fields without any formatting."
 msgstr ""
+"Os links podem ser formatadso com a linguaem Markdown. Essa aplicação também "
+"aceita links direto em Markdown, sem formatação."
 
 #: .\cookbook\templates\markdown_info.html:132
 #: .\cookbook\templates\markdown_info.html:145
 msgid "This will become an image"
-msgstr ""
+msgstr "Isso se tornará uma imagem"
 
 #: .\cookbook\templates\markdown_info.html:152
 msgid "Tables"
@@ -1439,15 +1459,17 @@ msgid ""
 "The recipes listed below are available for offline viewing because you have "
 "recently viewed them. Keep in mind that data might be outdated."
 msgstr ""
+"As receitas abaixo estão disponíveis de forma offline pois você recentemente "
+"as visualizou. Tenha em mente que os dados podem estar ultrapassados."
 
 #: .\cookbook\templates\openid\login.html:27
 #: .\cookbook\templates\socialaccount\authentication_error.html:27
 msgid "Back"
-msgstr ""
+msgstr "Voltar"
 
 #: .\cookbook\templates\property_editor.html:7
 msgid "Property Editor"
-msgstr ""
+msgstr "Editor"
 
 #: .\cookbook\templates\recipe_view.html:36
 msgid "Comments"
@@ -1464,7 +1486,7 @@ msgstr "Comentário"
 
 #: .\cookbook\templates\rest_framework\api.html:5
 msgid "Recipe Home"
-msgstr ""
+msgstr "Início - Receitas"
 
 #: .\cookbook\templates\search_info.html:5
 #: .\cookbook\templates\search_info.html:9
@@ -1627,7 +1649,7 @@ msgstr ""
 msgid ""
 "There are many options to configure the search depending on your personal "
 "preferences."
-msgstr ""
+msgstr "Existem mutas opções de configurações para a busca."
 
 #: .\cookbook\templates\settings.html:26
 msgid ""

cookbook/locale/ro/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-01 15:04+0200\n"
-"PO-Revision-Date: 2023-04-27 08:55+0000\n"
-"Last-Translator: noxonad <noxonad@proton.me>\n"
+"PO-Revision-Date: 2025-02-16 14:58+0000\n"
+"Last-Translator: Cots Partier <cots.pastier.34@icloud.com>\n"
 "Language-Team: Romanian <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/ro/>\n"
 "Language: ro\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
-"X-Generator: Weblate 4.15\n"
+"X-Generator: Weblate 5.8.4\n"
 
 #: .\cookbook\forms.py:45
 msgid ""
@@ -91,14 +91,16 @@ msgid ""
 "<a href=\"https://www.home-assistant.io/docs/authentication/#your-account-"
 "profile\">Long Lived Access Token</a> for your HomeAssistant instance"
 msgstr ""
+"<a href=\"https://www.home-assistant.io/docs/authentication/#your-account-"
+"profile\">Token the acces</a> pentru instanța ta de HomeAssistant"
 
 #: .\cookbook\forms.py:193
 msgid "Something like http://homeassistant.local:8123/api"
-msgstr ""
+msgstr "Asemănător cu http://homeassistant.local:8123/api"
 
 #: .\cookbook\forms.py:205
 msgid "http://homeassistant.local:8123/api for example"
-msgstr ""
+msgstr "http://homeassistant.local:8123/api de exemplu"
 
 #: .\cookbook\forms.py:222 .\cookbook\views\edit.py:117
 msgid "Storage"
@@ -150,10 +152,6 @@ msgstr ""
 "multe greșeli de scriere sunt ignorate)."
 
 #: .\cookbook\forms.py:340
-#, fuzzy
-#| msgid ""
-#| "Select type method of search.  Click <a href=\"/docs/search/\">here</a> "
-#| "for full desciption of choices."
 msgid ""
 "Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
 "full description of choices."
@@ -227,8 +225,6 @@ msgid "Partial Match"
 msgstr "Potrivire parțială"
 
 #: .\cookbook\forms.py:350
-#, fuzzy
-#| msgid "Starts Wtih"
 msgid "Starts With"
 msgstr "Începe cu"
 
@@ -284,38 +280,36 @@ msgid "You have more users than allowed in your space."
 msgstr "Aveți mai mulți utilizatori decât este permis în spațiul dvs."
 
 #: .\cookbook\helper\recipe_url_import.py:310
-#, fuzzy
-#| msgid "Use fractions"
 msgid "reverse rotation"
-msgstr "Utilizare fracții"
+msgstr "rotație inversă"
 
 #: .\cookbook\helper\recipe_url_import.py:311
 msgid "careful rotation"
-msgstr ""
+msgstr "rotire atentă"
 
 #: .\cookbook\helper\recipe_url_import.py:312
 msgid "knead"
-msgstr ""
+msgstr "frământă"
 
 #: .\cookbook\helper\recipe_url_import.py:313
 msgid "thicken"
-msgstr ""
+msgstr "se îngroașă"
 
 #: .\cookbook\helper\recipe_url_import.py:314
 msgid "warm up"
-msgstr ""
+msgstr "încălzire"
 
 #: .\cookbook\helper\recipe_url_import.py:315
 msgid "ferment"
-msgstr ""
+msgstr "ferment"
 
 #: .\cookbook\helper\recipe_url_import.py:316
 msgid "sous-vide"
-msgstr ""
+msgstr "sous-vide"
 
 #: .\cookbook\helper\shopping_helper.py:150
 msgid "You must supply a servings size"
-msgstr ""
+msgstr "Trebuie să specificați dimensiunea porției"
 
 #: .\cookbook\helper\template_helper.py:95
 #: .\cookbook\helper\template_helper.py:97
@@ -325,11 +319,11 @@ msgstr "Nu s-a putut analiza codul șablonului."
 #: .\cookbook\integration\copymethat.py:44
 #: .\cookbook\integration\melarecipes.py:37
 msgid "Favorite"
-msgstr ""
+msgstr "Favorit"
 
 #: .\cookbook\integration\copymethat.py:50
 msgid "I made this"
-msgstr ""
+msgstr "Am făcut acest lucru"
 
 #: .\cookbook\integration\integration.py:209
 msgid ""
@@ -357,10 +351,8 @@ msgid "Imported %s recipes."
 msgstr "%s rețete importate."
 
 #: .\cookbook\integration\openeats.py:28
-#, fuzzy
-#| msgid "Recipe Home"
 msgid "Recipe source:"
-msgstr "Rețetă acasă"
+msgstr "Sursa rețetei:"
 
 #: .\cookbook\integration\paprika.py:49
 msgid "Notes"
@@ -376,10 +368,8 @@ msgstr "Sursă"
 
 #: .\cookbook\integration\recettetek.py:54
 #: .\cookbook\integration\recipekeeper.py:70
-#, fuzzy
-#| msgid "Import Log"
 msgid "Imported from"
-msgstr "Jurnal de import"
+msgstr "Importat din"
 
 #: .\cookbook\integration\saffron.py:23
 msgid "Servings"
@@ -403,19 +393,17 @@ msgstr "Secțiune"
 
 #: .\cookbook\management\commands\fix_duplicate_properties.py:15
 msgid "Fixes foods with "
-msgstr ""
+msgstr "Corectează alimentele cu "
 
 #: .\cookbook\management\commands\rebuildindex.py:14
 msgid "Rebuilds full text search index on Recipe"
 msgstr "Reconstruiește indexul de căutare text complet pe rețetă"
 
 #: .\cookbook\management\commands\rebuildindex.py:18
-#, fuzzy
-#| msgid "Only Postgress databases use full text search, no index to rebuild"
 msgid "Only Postgresql databases use full text search, no index to rebuild"
 msgstr ""
-"Numai bazele de date Postgress utilizează căutare text complet, nici un "
-"index de reconstruit"
+"Numai bazele de date Postgress utilizează ccăutarea textului integral, nici "
+"un index de reconstruit"
 
 #: .\cookbook\management\commands\rebuildindex.py:29
 msgid "Recipe index rebuild complete."
@@ -443,29 +431,29 @@ msgstr "Altele"
 
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:17
 msgid "Fat"
-msgstr ""
+msgstr "Grăsime"
 
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:17
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:18
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:19
 msgid "g"
-msgstr ""
+msgstr "g"
 
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:18
 msgid "Carbohydrates"
-msgstr ""
+msgstr "Carbohidrați"
 
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:19
 msgid "Proteins"
-msgstr ""
+msgstr "Proteine"
 
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:20
 msgid "Calories"
-msgstr ""
+msgstr "Calorii"
 
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:20
 msgid "kcal"
-msgstr ""
+msgstr "kcal"
 
 #: .\cookbook\models.py:325
 msgid ""
@@ -500,24 +488,20 @@ msgid " is part of a recipe step and cannot be deleted"
 msgstr " face parte dintr-un pas de rețetă și nu poate fi șters"
 
 #: .\cookbook\models.py:918
-#, fuzzy
-#| msgid "Automations"
 msgid "Nutrition"
-msgstr "Automatizări"
+msgstr "Nutriție"
 
 #: .\cookbook\models.py:918
-#, fuzzy
-#| msgid "Merge"
 msgid "Allergen"
-msgstr "Unire"
+msgstr "Alergen"
 
 #: .\cookbook\models.py:919
 msgid "Price"
-msgstr ""
+msgstr "Preț"
 
 #: .\cookbook\models.py:919
 msgid "Goal"
-msgstr ""
+msgstr "Obiectiv"
 
 #: .\cookbook\models.py:1408 .\cookbook\templates\search_info.html:28
 msgid "Simple"
@@ -548,42 +532,32 @@ msgid "Keyword Alias"
 msgstr "Pseudonim cuvânt cheie"
 
 #: .\cookbook\models.py:1470
-#, fuzzy
-#| msgid "Description"
 msgid "Description Replace"
-msgstr "Descriere"
+msgstr "Înlocuire Descriere"
 
 #: .\cookbook\models.py:1471
-#, fuzzy
-#| msgid "Instructions"
 msgid "Instruction Replace"
-msgstr "Instrucțiuni"
+msgstr "Înlocuire Instrucțiuni"
 
 #: .\cookbook\models.py:1472
-#, fuzzy
-#| msgid "Select Unit"
 msgid "Never Unit"
-msgstr "Selectare unitate"
+msgstr "Unitate nulă"
 
 #: .\cookbook\models.py:1473
 msgid "Transpose Words"
-msgstr ""
+msgstr "Schimbă Ordinea Cuvintelor"
 
 #: .\cookbook\models.py:1474
-#, fuzzy
-#| msgid "Food Alias"
 msgid "Food Replace"
-msgstr "Pseudonim produse alimentare"
+msgstr "Aliment echivalent"
 
 #: .\cookbook\models.py:1475
-#, fuzzy
-#| msgid "Unit Alias"
 msgid "Unit Replace"
-msgstr "Pseudonim unități"
+msgstr "Unitate echivalentă"
 
 #: .\cookbook\models.py:1476
 msgid "Name Replace"
-msgstr ""
+msgstr "Înlocuire Nume"
 
 #: .\cookbook\models.py:1503 .\cookbook\views\delete.py:40
 #: .\cookbook\views\edit.py:210 .\cookbook\views\new.py:39
@@ -591,10 +565,8 @@ msgid "Recipe"
 msgstr "Rețetă"
 
 #: .\cookbook\models.py:1504
-#, fuzzy
-#| msgid "Foods"
 msgid "Food"
-msgstr "Alimente"
+msgstr "Mâncare"
 
 #: .\cookbook\models.py:1505 .\cookbook\templates\base.html:149
 msgid "Keyword"
@@ -610,7 +582,7 @@ msgstr "Ați atins limita de încărcare a fișierelor."
 
 #: .\cookbook\serializer.py:328
 msgid "Cannot modify Space owner permission."
-msgstr ""
+msgstr "Nu se poate modifica permisiunea proprietarului spațiului."
 
 #: .\cookbook\serializer.py:1270
 msgid "Hello"
@@ -651,30 +623,35 @@ msgstr "Invitație Tandoor Recipes"
 
 #: .\cookbook\serializer.py:1426
 msgid "Existing shopping list to update"
-msgstr ""
+msgstr "Lista de cumpărături existentă de actualizat"
 
 #: .\cookbook\serializer.py:1428
 msgid ""
 "List of ingredient IDs from the recipe to add, if not provided all "
 "ingredients will be added."
 msgstr ""
+"ID-urile ingredientelor din rețetă pentru a fi adăugate, dacă nu sunt "
+"specificate toate ingrediente vor fi adăugate."
 
 #: .\cookbook\serializer.py:1430
 msgid ""
 "Providing a list_recipe ID and servings of 0 will delete that shopping list."
 msgstr ""
+"Furnizarea unui ID de rețetă și un număr de porții egal cu 0 va șterge lista "
+"cumpărături."
 
 #: .\cookbook\serializer.py:1439
 msgid "Amount of food to add to the shopping list"
-msgstr ""
+msgstr "Cantitatea de mâncare pentru a fi adăugată în lista cumpărături"
 
 #: .\cookbook\serializer.py:1441
 msgid "ID of unit to use for the shopping list"
-msgstr ""
+msgstr "ID-ul unității pentru a fi utilizat în lista de cumpărături"
 
 #: .\cookbook\serializer.py:1443
 msgid "When set to true will delete all food from active shopping lists."
 msgstr ""
+"Când este activ se șterge toată mâncarea din listele de cumpărături active."
 
 #: .\cookbook\tables.py:69 .\cookbook\tables.py:83
 #: .\cookbook\templates\generic\delete_template.html:7
@@ -1027,10 +1004,8 @@ msgstr "Istoric"
 #: .\cookbook\templates\base.html:263
 #: .\cookbook\templates\ingredient_editor.html:7
 #: .\cookbook\templates\ingredient_editor.html:13
-#, fuzzy
-#| msgid "Ingredients"
 msgid "Ingredient Editor"
-msgstr "Ingrediente"
+msgstr "Editor de Ingrediente"
 
 #: .\cookbook\templates\base.html:275
 #: .\cookbook\templates\export_response.html:7
@@ -1040,13 +1015,11 @@ msgstr "Exportă"
 
 #: .\cookbook\templates\base.html:287
 msgid "Properties"
-msgstr ""
+msgstr "Atribute"
 
 #: .\cookbook\templates\base.html:301 .\cookbook\views\lists.py:255
-#, fuzzy
-#| msgid "Account Connections"
 msgid "Unit Conversions"
-msgstr "Conexiuni de cont"
+msgstr "Conversii de unități"
 
 #: .\cookbook\templates\base.html:318 .\cookbook\templates\index.html:47
 msgid "Import Recipe"
@@ -1066,10 +1039,8 @@ msgid "Space Settings"
 msgstr "Setări spațiu"
 
 #: .\cookbook\templates\base.html:340
-#, fuzzy
-#| msgid "External Recipes"
 msgid "External Connectors"
-msgstr "Rețete externe"
+msgstr "Conectori externi"
 
 #: .\cookbook\templates\base.html:345 .\cookbook\templates\system.html:13
 msgid "System"
@@ -1081,15 +1052,13 @@ msgstr "Admin"
 
 #: .\cookbook\templates\base.html:351
 #: .\cookbook\templates\space_overview.html:25
-#, fuzzy
-#| msgid "No Space"
 msgid "Your Spaces"
-msgstr "Fără spațiu"
+msgstr "Spațiul tău"
 
 #: .\cookbook\templates\base.html:362
 #: .\cookbook\templates\space_overview.html:6
 msgid "Overview"
-msgstr ""
+msgstr "Sumar"
 
 #: .\cookbook\templates\base.html:372
 msgid "Markdown Guide"
@@ -1113,11 +1082,11 @@ msgstr "Deconectare"
 
 #: .\cookbook\templates\base.html:406
 msgid "You are using the free version of Tandor"
-msgstr ""
+msgstr "Utilizați o versiune gratuită de Tandor"
 
 #: .\cookbook\templates\base.html:407
 msgid "Upgrade Now"
-msgstr ""
+msgstr "Actualizează acum"
 
 #: .\cookbook\templates\batch\edit.html:6
 msgid "Batch edit Category"
@@ -1213,7 +1182,7 @@ msgstr "Sunteți sigur că doriți să ștergeți %(title)s: <b>%(object)s</b> "
 
 #: .\cookbook\templates\generic\delete_template.html:22
 msgid "This cannot be undone!"
-msgstr ""
+msgstr "Este ireversibil!"
 
 #: .\cookbook\templates\generic\delete_template.html:27
 msgid "Protected"
@@ -1230,7 +1199,7 @@ msgstr "Anulare"
 #: .\cookbook\templates\generic\edit_template.html:6
 #: .\cookbook\templates\generic\edit_template.html:14
 msgid "Edit"
-msgstr "Editare"
+msgstr "Editează"
 
 #: .\cookbook\templates\generic\edit_template.html:32
 msgid "View"
@@ -1379,8 +1348,6 @@ msgstr ""
 
 #: .\cookbook\templates\markdown_info.html:57
 #: .\cookbook\templates\markdown_info.html:73
-#, fuzzy
-#| msgid "or by leaving a blank line inbetween."
 msgid "or by leaving a blank line in between."
 msgstr "sau lăsând o linie goală între ele."
 
@@ -1404,10 +1371,6 @@ msgid "Lists"
 msgstr "Liste"
 
 #: .\cookbook\templates\markdown_info.html:85
-#, fuzzy
-#| msgid ""
-#| "Lists can ordered or unorderd. It is <b>important to leave a blank line "
-#| "before the list!</b>"
 msgid ""
 "Lists can ordered or unordered. It is <b>important to leave a blank line "
 "before the list!</b>"
@@ -1539,11 +1502,11 @@ msgstr ""
 #: .\cookbook\templates\openid\login.html:27
 #: .\cookbook\templates\socialaccount\authentication_error.html:27
 msgid "Back"
-msgstr ""
+msgstr "Înapoi"
 
 #: .\cookbook\templates\property_editor.html:7
 msgid "Property Editor"
-msgstr ""
+msgstr "Editor atribute"
 
 #: .\cookbook\templates\recipe_view.html:36
 msgid "Comments"
@@ -1620,15 +1583,6 @@ msgstr ""
 "            "
 
 #: .\cookbook\templates\search_info.html:29
-#, fuzzy
-#| msgid ""
-#| " \n"
-#| "            Simple searches ignore punctuation and common words such as "
-#| "'the', 'a', 'and'. And will treat seperate words as required.\n"
-#| "            Searching for 'apple or flour' will return any recipe that "
-#| "includes both 'apple' and 'flour' anywhere in the fields that have been "
-#| "selected for a full text search.\n"
-#| "            "
 msgid ""
 " \n"
 "            Simple searches ignore punctuation and common words such as "
@@ -1666,23 +1620,6 @@ msgstr ""
 "            "
 
 #: .\cookbook\templates\search_info.html:39
-#, fuzzy
-#| msgid ""
-#| " \n"
-#| "            Web searches simulate functionality found on many web search "
-#| "sites supporting special syntax.\n"
-#| "            Placing quotes around several words will convert those words "
-#| "into a phrase.\n"
-#| "            'or' is recongized as searching for the word (or phrase) "
-#| "immediately before 'or' OR the word (or phrase) directly after.\n"
-#| "            '-' is recognized as searching for recipes that do not "
-#| "include the word (or phrase) that comes immediately after. \n"
-#| "            For example searching for 'apple pie' or cherry -butter will "
-#| "return any recipe that includes the phrase 'apple pie' or the word "
-#| "'cherry' \n"
-#| "            in any field included in the full text search but exclude any "
-#| "recipe that has the word 'butter' in any field included.\n"
-#| "            "
 msgid ""
 " \n"
 "            Web searches simulate functionality found on many web search "
@@ -1705,8 +1642,8 @@ msgstr ""
 "uri de căutare web care acceptă sintaxa specială.\n"
 "            Plasarea ghilimelelor în jurul mai multor cuvinte va converti "
 "aceste cuvinte într-o frază.\n"
-"            'sau' este recunoscut pentru căutarea pentru cuvântul (sau "
-"fraza) imediat înainte de 'sau' SAU cuvântul (sau fraza) direct după.\n"
+"            'sau' este recunoscut pentru căutarea pentru cuvântul (sau fraza)"
+" imediat înainte de 'sau' SAU cuvântul (sau fraza) direct după.\n"
 "            '-' este recunoscut pentru căutarea rețetelor care nu includ "
 "cuvântul (sau fraza) care vine imediat după. \n"
 "            De exemplu, căutarea 'plăcintei cu mere' sau a untului de cireșe "
@@ -1729,19 +1666,6 @@ msgstr ""
 "            "
 
 #: .\cookbook\templates\search_info.html:59
-#, fuzzy
-#| msgid ""
-#| " \n"
-#| "            Another approach to searching that also requires Postgresql "
-#| "is fuzzy search or trigram similarity. A trigram is a group of three "
-#| "consecutive characters.\n"
-#| "            For example searching for 'apple' will create x trigrams "
-#| "'app', 'ppl', 'ple' and will create a score of how closely words match "
-#| "the generated trigrams.\n"
-#| "            One benefit of searching trigams is that a search for "
-#| "'sandwich' will find mispelled words such as 'sandwhich' that would be "
-#| "missed by other methods.\n"
-#| "            "
 msgid ""
 " \n"
 "            Another approach to searching that also requires Postgresql is "
@@ -1948,17 +1872,15 @@ msgstr "Creează cont superuser"
 
 #: .\cookbook\templates\socialaccount\authentication_error.html:7
 #: .\cookbook\templates\socialaccount\authentication_error.html:23
-#, fuzzy
-#| msgid "Social Login"
 msgid "Social Network Login Failure"
-msgstr "Autentificare utilizând rețeaua socială"
+msgstr "Eșec la conectarea la rețeaua socială"
 
 #: .\cookbook\templates\socialaccount\authentication_error.html:25
-#, fuzzy
-#| msgid "An error occurred attempting to move "
 msgid ""
 "An error occurred while attempting to login via your social network account."
-msgstr "A apărut o eroare la încercarea de a muta "
+msgstr ""
+"S-a produs o eroare în timp ce se încearca autentificarea prin contul tău de "
+"rețea socială."
 
 #: .\cookbook\templates\socialaccount\connections.html:4
 #: .\cookbook\templates\socialaccount\connections.html:15
@@ -1994,17 +1916,18 @@ msgstr "Înregistrare"
 #: .\cookbook\templates\socialaccount\login.html:9
 #, python-format
 msgid "Connect %(provider)s"
-msgstr ""
+msgstr "Conectează %(provider)s"
 
 #: .\cookbook\templates\socialaccount\login.html:11
 #, python-format
 msgid "You are about to connect a new third party account from %(provider)s."
 msgstr ""
+"Sunteți pe cale să conectați un nou cont de terță parte din %(provider)s."
 
 #: .\cookbook\templates\socialaccount\login.html:13
 #, python-format
 msgid "Sign In Via %(provider)s"
-msgstr ""
+msgstr "Intră în cont prin %(provider)s"
 
 #: .\cookbook\templates\socialaccount\login.html:15
 #, python-format
@@ -2013,7 +1936,7 @@ msgstr ""
 
 #: .\cookbook\templates\socialaccount\login.html:20
 msgid "Continue"
-msgstr ""
+msgstr "Continuă"
 
 #: .\cookbook\templates\socialaccount\signup.html:10
 #, python-format
@@ -2046,7 +1969,7 @@ msgstr "Conectați-vă utilizând"
 
 #: .\cookbook\templates\space_manage.html:7
 msgid "Space Management"
-msgstr ""
+msgstr "Managementul spațiului"
 
 #: .\cookbook\templates\space_manage.html:26
 msgid "Space:"
@@ -2057,10 +1980,8 @@ msgid "Manage Subscription"
 msgstr "Gestionarea abonamentului"
 
 #: .\cookbook\templates\space_overview.html:13 .\cookbook\views\delete.py:184
-#, fuzzy
-#| msgid "Space:"
 msgid "Space"
-msgstr "Spațiu:"
+msgstr "Spațiu"
 
 #: .\cookbook\templates\space_overview.html:17
 msgid ""
@@ -2078,13 +1999,11 @@ msgstr ""
 
 #: .\cookbook\templates\space_overview.html:53
 msgid "Owner"
-msgstr ""
+msgstr "Proprietar"
 
 #: .\cookbook\templates\space_overview.html:57
-#, fuzzy
-#| msgid "Create Space"
 msgid "Leave Space"
-msgstr "Creare spațiu"
+msgstr "Părăsire spațiu"
 
 #: .\cookbook\templates\space_overview.html:78
 #: .\cookbook\templates\space_overview.html:88
@@ -2147,6 +2066,11 @@ msgid ""
 "script to generate version information (done automatically in docker).\n"
 "        "
 msgstr ""
+"\n"
+"            Trebuie să executați <code>version.py</code> în scripturile de "
+"actualizare pentru a genera informații despre versiune (realizate automat în "
+"docker).\n"
+"        "
 
 #: .\cookbook\templates\system.html:46
 msgid "Media Serving"
@@ -2237,7 +2161,7 @@ msgstr ""
 
 #: .\cookbook\templates\system.html:86
 msgid "Allowed Hosts"
-msgstr ""
+msgstr "Domenii Permise"
 
 #: .\cookbook\templates\system.html:90
 msgid ""
@@ -2257,10 +2181,8 @@ msgid "Info"
 msgstr "Informație"
 
 #: .\cookbook\templates\system.html:110 .\cookbook\templates\system.html:127
-#, fuzzy
-#| msgid "Use fractions"
 msgid "Migrations"
-msgstr "Utilizare fracții"
+msgstr "Migrări"
 
 #: .\cookbook\templates\system.html:116
 msgid ""
@@ -2276,19 +2198,17 @@ msgstr ""
 
 #: .\cookbook\templates\system.html:182
 msgid "False"
-msgstr ""
+msgstr "Fals"
 
 #: .\cookbook\templates\system.html:182
 msgid "True"
-msgstr ""
+msgstr "Adevărat"
 
 #: .\cookbook\templates\system.html:207
 msgid "Hide"
-msgstr ""
+msgstr "Ascunde"
 
 #: .\cookbook\templates\system.html:210
-#, fuzzy
-#| msgid "Show Log"
 msgid "Show"
 msgstr "Afișare jurnal"
 
@@ -2355,29 +2275,34 @@ msgstr "{child.name} a fost mutat cu succes la părintele {parent.name}"
 #: .\cookbook\views\api.py:589
 #, python-brace-format
 msgid "{obj.name} was removed from the shopping list."
-msgstr ""
+msgstr "{obj.name} a fost șters din lista de cumpărături."
 
 #: .\cookbook\views\api.py:594 .\cookbook\views\api.py:1037
 #: .\cookbook\views\api.py:1050
 #, python-brace-format
 msgid "{obj.name} was added to the shopping list."
-msgstr ""
+msgstr "{obj.name} a fost adăugat la lista de cumpărături."
 
 #: .\cookbook\views\api.py:742
 msgid "Filter meal plans from date (inclusive) in the format of YYYY-MM-DD."
-msgstr ""
+msgstr "Filtrează planurile de masă din data (inclusiv) în formatul AAAA-LL-ZZ."
 
 #: .\cookbook\views\api.py:743
 msgid "Filter meal plans to date (inclusive) in the format of YYYY-MM-DD."
 msgstr ""
+"Filtrează planurile de masă până la data (inclusiv) în formatul AAAA-LL-ZZ."
 
 #: .\cookbook\views\api.py:744
 msgid "Filter meal plans with MealType ID. For multiple repeat parameter."
 msgstr ""
+"Filtrează planurile de masă cu ID-ul tipului de rețetă. Pentru mai multe "
+"repetă parametrul."
 
 #: .\cookbook\views\api.py:872
 msgid "ID of recipe a step is part of. For multiple repeat parameter."
 msgstr ""
+"ID-ul rețetei din care face pasul face parte. Pentru mai multe repetă "
+"parametrul."
 
 #: .\cookbook\views\api.py:873
 msgid "Query string matched (fuzzy) against object name."
@@ -2555,8 +2480,6 @@ msgid "Bad URL Schema."
 msgstr ""
 
 #: .\cookbook\views\api.py:1474
-#, fuzzy
-#| msgid "No useable data could be found."
 msgid "No usable data could be found."
 msgstr "Nu au putut fi găsite date utilizabile."
 
@@ -2611,20 +2534,16 @@ msgstr ""
 "puțin un supervizor."
 
 #: .\cookbook\views\delete.py:135
-#, fuzzy
-#| msgid "Storage Backend"
 msgid "Connectors Config Backend"
-msgstr "Backend de stocare"
+msgstr "Configurare Backend Conectori"
 
 #: .\cookbook\views\delete.py:157
 msgid "Invite Link"
 msgstr "Link de invitare"
 
 #: .\cookbook\views\delete.py:168
-#, fuzzy
-#| msgid "Members"
 msgid "Space Membership"
-msgstr "Membri"
+msgstr "Membri spațiu"
 
 #: .\cookbook\views\edit.py:84
 msgid "You cannot edit this storage!"
@@ -2639,10 +2558,8 @@ msgid "There was an error updating this storage backend!"
 msgstr "A existat o eroare la actualizarea acestui backend de stocare!"
 
 #: .\cookbook\views\edit.py:134
-#, fuzzy
-#| msgid "Changes saved!"
 msgid "Config saved!"
-msgstr "Modificări salvate!"
+msgstr "Configurare salvată!"
 
 #: .\cookbook\views\edit.py:142
 msgid "ConnectorConfig"
@@ -2675,10 +2592,8 @@ msgid "Shopping List"
 msgstr "Listă de cumpărături"
 
 #: .\cookbook\views\lists.py:77 .\cookbook\views\new.py:98
-#, fuzzy
-#| msgid "Storage Backend"
 msgid "Connector Config Backend"
-msgstr "Backend de stocare"
+msgstr "Configurare Backend pentru Conector"
 
 #: .\cookbook\views\lists.py:91
 msgid "Invite Links"
@@ -2693,10 +2608,8 @@ msgid "Shopping Categories"
 msgstr "Categorii de cumpărături"
 
 #: .\cookbook\views\lists.py:202
-#, fuzzy
-#| msgid "Filter"
 msgid "Custom Filters"
-msgstr "Filtru"
+msgstr "Filtre Personalizate"
 
 #: .\cookbook\views\lists.py:239
 msgid "Steps"
@@ -2707,10 +2620,8 @@ msgid "Property Types"
 msgstr ""
 
 #: .\cookbook\views\new.py:86
-#, fuzzy
-#| msgid "This feature is not available in the demo version!"
 msgid "This feature is not enabled by the server admin!"
-msgstr "Această funcție nu este disponibilă în versiunea demo!"
+msgstr "Această funcție nu a fost activată de către administrator!"
 
 #: .\cookbook\views\new.py:123
 msgid "Imported new recipe!"
@@ -2726,11 +2637,9 @@ msgid "This feature is not available in the demo version!"
 msgstr "Această funcție nu este disponibilă în versiunea demo!"
 
 #: .\cookbook\views\views.py:74
-#, fuzzy
-#| msgid "You have reached the maximum number of recipes for your space."
 msgid ""
 "You have the reached the maximum amount of spaces that can be owned by you."
-msgstr "Ai ajuns la numărul maxim de rețete pentru spațiul dvs."
+msgstr "Ai ajuns la numărul maxim de spații pe care le poți deține."
 
 #: .\cookbook\views\views.py:89
 msgid ""
@@ -2779,29 +2688,15 @@ msgid "Unable to determine PostgreSQL version."
 msgstr ""
 
 #: .\cookbook\views\views.py:317
-#, fuzzy
-#| msgid ""
-#| "\n"
-#| "            This application is not running with a Postgres database "
-#| "backend. This is ok but not recommended as some\n"
-#| "            features only work with postgres databases.\n"
-#| "        "
 msgid ""
 "This application is not running with a Postgres database backend. This is ok "
 "but not recommended as some features only work with postgres databases."
 msgstr ""
-"\n"
-"            Această aplicație nu se execută cu un backend de bază de date "
-"Postgres. Acest lucru este ok, dar nu este recomandat deoarece unele\n"
-"            caracteristicile funcționează numai cu baze de date Postgres.\n"
-"        "
+"Această aplicație nu se execută cu un backend de bază de date Postgres. "
+"Acest lucru este ok, dar nu este recomandat deoarece unele caracteristicile "
+"funcționează numai cu baze de date Postgres."
 
 #: .\cookbook\views\views.py:360
-#, fuzzy
-#| msgid ""
-#| "The setup page can only be used to create the first user! If you have "
-#| "forgotten your superuser credentials please consult the django "
-#| "documentation on how to reset passwords."
 msgid ""
 "The setup page can only be used to create the first "
 "user!                     If you have forgotten your superuser credentials "
@@ -2852,10 +2747,8 @@ msgid "Manage recipes, shopping list, meal plans and more."
 msgstr ""
 
 #: .\cookbook\views\views.py:458
-#, fuzzy
-#| msgid "Meal-Plan"
 msgid "Plan"
-msgstr "Plan de alimentare"
+msgstr "Plan"
 
 #: .\cookbook\views\views.py:458
 msgid "View your meal Plan"
@@ -2863,13 +2756,11 @@ msgstr ""
 
 #: .\cookbook\views\views.py:459
 msgid "View your cookbooks"
-msgstr ""
+msgstr "Vizualizează cărțile de bucate"
 
 #: .\cookbook\views\views.py:460
-#, fuzzy
-#| msgid "New Shopping List"
 msgid "View your shopping lists"
-msgstr "Listă de cumpărături nouă"
+msgstr "Vezi listele de cumpărături"
 
 #~ msgid "Default unit"
 #~ msgstr "Unitate implicită"

cookbook/locale/sv/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-01 15:04+0200\n"
-"PO-Revision-Date: 2024-09-17 11:58+0000\n"
-"Last-Translator: Bebbe K <kajolekk91@gmail.com>\n"
+"PO-Revision-Date: 2025-02-07 08:58+0000\n"
+"Last-Translator: Mattias G <mattias.granlund@gmail.com>\n"
 "Language-Team: Swedish <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/sv/>\n"
 "Language: sv\n"
@@ -17,7 +17,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 5.6.2\n"
+"X-Generator: Weblate 5.8.4\n"
 
 #: .\cookbook\forms.py:45
 msgid ""
@@ -549,7 +549,7 @@ msgstr "Ersätt Enhet"
 
 #: .\cookbook\models.py:1476
 msgid "Name Replace"
-msgstr ""
+msgstr "Ersättningsnamn"
 
 #: .\cookbook\models.py:1503 .\cookbook\views\delete.py:40
 #: .\cookbook\views\edit.py:210 .\cookbook\views\new.py:39
@@ -566,15 +566,15 @@ msgstr "Nyckelord"
 
 #: .\cookbook\serializer.py:222
 msgid "File uploads are not enabled for this Space."
-msgstr ""
+msgstr "Filuppladdning är inte aktiverat för det här utrymmet."
 
 #: .\cookbook\serializer.py:233
 msgid "You have reached your file upload limit."
-msgstr ""
+msgstr "Du har nått din maxgräns för uppladdningar."
 
 #: .\cookbook\serializer.py:328
 msgid "Cannot modify Space owner permission."
-msgstr ""
+msgstr "Kan inte modifiera utrymmets ägar-rättigheter."
 
 #: .\cookbook\serializer.py:1270
 msgid "Hello"
@@ -582,56 +582,61 @@ msgstr "Hej"
 
 #: .\cookbook\serializer.py:1270
 msgid "You have been invited by "
-msgstr ""
+msgstr "Du har bjudits in av "
 
 #: .\cookbook\serializer.py:1272
 msgid " to join their Tandoor Recipes space "
-msgstr ""
+msgstr " för att ansluta till deras Tandoor recept utrymme "
 
 #: .\cookbook\serializer.py:1274
 msgid "Click the following link to activate your account: "
-msgstr ""
+msgstr "Klicka på länken för att aktivera ditt konto: "
 
 #: .\cookbook\serializer.py:1276
 msgid ""
 "If the link does not work use the following code to manually join the space: "
 msgstr ""
+"Om länken inte fungerar kan du testa följande kod för att manuellt aktivera "
+"ditt utrymme: "
 
 #: .\cookbook\serializer.py:1278
 msgid "The invitation is valid until "
-msgstr ""
+msgstr "Inbjudningen är giltig till "
 
 #: .\cookbook\serializer.py:1280
 msgid ""
 "Tandoor Recipes is an Open Source recipe manager. Check it out on GitHub "
 msgstr ""
+"Tandoor recept är en recept-hanterar med öppen källkod. Se mer på GitHub "
 
 #: .\cookbook\serializer.py:1283
 msgid "Tandoor Recipes Invite"
-msgstr ""
+msgstr "Tandoor recept inbjudan"
 
 #: .\cookbook\serializer.py:1426
 msgid "Existing shopping list to update"
-msgstr ""
+msgstr "Existerande inköpslistor att uppdatera"
 
 #: .\cookbook\serializer.py:1428
 msgid ""
 "List of ingredient IDs from the recipe to add, if not provided all "
 "ingredients will be added."
 msgstr ""
+"Lista med ingrediens ID:n från receptet att lägga till, om inget angetts "
+"kommer alla ingredienser bli tillagda."
 
 #: .\cookbook\serializer.py:1430
 msgid ""
 "Providing a list_recipe ID and servings of 0 will delete that shopping list."
-msgstr ""
+msgstr "Anges ett list_recept ID och 0 portioner kommer den listan raderas."
 
 #: .\cookbook\serializer.py:1439
 msgid "Amount of food to add to the shopping list"
-msgstr ""
+msgstr "Mängd av ingrediens att lägga till på inköpslistan"
 
 #: .\cookbook\serializer.py:1441
 msgid "ID of unit to use for the shopping list"
-msgstr ""
+msgstr "ID eller enhet att använda för inköpslistan"
 
 #: .\cookbook\serializer.py:1443
 msgid "When set to true will delete all food from active shopping lists."
@@ -681,7 +686,7 @@ msgstr "Email"
 
 #: .\cookbook\templates\account\email.html:19
 msgid "The following e-mail addresses are associated with your account:"
-msgstr ""
+msgstr "Följande epost-addresser är associerade med ditt konto:"
 
 #: .\cookbook\templates\account\email.html:36
 msgid "Verified"
@@ -696,14 +701,12 @@ msgid "Primary"
 msgstr "Primär"
 
 #: .\cookbook\templates\account\email.html:47
-#, fuzzy
-#| msgid "Make Header"
 msgid "Make Primary"
-msgstr "Skapa titel"
+msgstr "Markera som primär"
 
 #: .\cookbook\templates\account\email.html:49
 msgid "Re-send Verification"
-msgstr ""
+msgstr "Sänd verifikationen igen"
 
 #: .\cookbook\templates\account\email.html:50
 #: .\cookbook\templates\generic\delete_template.html:57

cookbook/locale/tr/LC_MESSAGES/django.po

@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-01 15:04+0200\n"
-"PO-Revision-Date: 2024-07-03 16:38+0000\n"
-"Last-Translator: Taylan TATLI <uyelik-tandoor@tatli.me>\n"
+"PO-Revision-Date: 2025-01-20 05:20+0000\n"
+"Last-Translator: Yigit <yigit.gungor@outlook.com>\n"
 "Language-Team: Turkish <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/tr/>\n"
 "Language: tr\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 5.4.2\n"
+"X-Generator: Weblate 5.8.4\n"
 
 #: .\cookbook\forms.py:45
 msgid ""
@@ -199,7 +199,7 @@ msgstr ""
 
 #: .\cookbook\forms.py:350
 msgid "Search Method"
-msgstr ""
+msgstr "Arama Metodu"
 
 #: .\cookbook\forms.py:350
 msgid "Fuzzy Lookups"
@@ -207,15 +207,15 @@ msgstr ""
 
 #: .\cookbook\forms.py:350
 msgid "Ignore Accent"
-msgstr ""
+msgstr "Harflerdeki Vurguları Görmezden Gel"
 
 #: .\cookbook\forms.py:350
 msgid "Partial Match"
-msgstr ""
+msgstr "Kısmi Eşleşme"
 
 #: .\cookbook\forms.py:350
 msgid "Starts With"
-msgstr ""
+msgstr "İle başlayan"
 
 #: .\cookbook\forms.py:351
 msgid "Fuzzy Search"
@@ -223,18 +223,20 @@ msgstr ""
 
 #: .\cookbook\forms.py:351
 msgid "Full Text"
-msgstr ""
+msgstr "Tam Metin"
 
 #: .\cookbook\helper\AllAuthCustomAdapter.py:41
 msgid ""
 "In order to prevent spam, the requested email was not send. Please wait a "
 "few minutes and try again."
 msgstr ""
+"İstenmeyen e-postayı önlemek için istenen e-posta gönderilemedi. Lütfen "
+"birkaç dakika bekleyin ve tekrar deneyin."
 
 #: .\cookbook\helper\permission_helper.py:164
 #: .\cookbook\helper\permission_helper.py:187 .\cookbook\views\views.py:117
 msgid "You are not logged in and therefore cannot view this page!"
-msgstr ""
+msgstr "Giriş yapmadınız ve bu nedenle bu sayfayı görüntüleyemezsiniz!"
 
 #: .\cookbook\helper\permission_helper.py:168
 #: .\cookbook\helper\permission_helper.py:174
@@ -247,68 +249,68 @@ msgstr ""
 #: .\cookbook\helper\permission_helper.py:341 .\cookbook\views\data.py:35
 #: .\cookbook\views\views.py:127 .\cookbook\views\views.py:131
 msgid "You do not have the required permissions to view this page!"
-msgstr ""
+msgstr "Bu sayfayı görüntülemek için gerekli izinlere sahip değilsiniz!"
 
 #: .\cookbook\helper\permission_helper.py:192
 #: .\cookbook\helper\permission_helper.py:215
 #: .\cookbook\helper\permission_helper.py:237
 #: .\cookbook\helper\permission_helper.py:252
 msgid "You cannot interact with this object as it is not owned by you!"
-msgstr ""
+msgstr "Bu nesne size ait olmadığı için onunla etkileşime giremezsiniz!"
 
 #: .\cookbook\helper\permission_helper.py:402
 msgid "You have reached the maximum number of recipes for your space."
-msgstr ""
+msgstr "Alanınız için maksimum tarif sayısına ulaştınız."
 
 #: .\cookbook\helper\permission_helper.py:414
 msgid "You have more users than allowed in your space."
-msgstr ""
+msgstr "Alanınızda izin verilenden daha fazla kullanıcı var."
 
 #: .\cookbook\helper\recipe_url_import.py:310
 msgid "reverse rotation"
-msgstr ""
+msgstr "ters dönüş"
 
 #: .\cookbook\helper\recipe_url_import.py:311
 msgid "careful rotation"
-msgstr ""
+msgstr "dikkatli dönüş"
 
 #: .\cookbook\helper\recipe_url_import.py:312
 msgid "knead"
-msgstr ""
+msgstr "yoğur"
 
 #: .\cookbook\helper\recipe_url_import.py:313
 msgid "thicken"
-msgstr ""
+msgstr "kalınlaştır"
 
 #: .\cookbook\helper\recipe_url_import.py:314
 msgid "warm up"
-msgstr ""
+msgstr "ısıt"
 
 #: .\cookbook\helper\recipe_url_import.py:315
 msgid "ferment"
-msgstr ""
+msgstr "mayala"
 
 #: .\cookbook\helper\recipe_url_import.py:316
 msgid "sous-vide"
-msgstr ""
+msgstr "sous-vide"
 
 #: .\cookbook\helper\shopping_helper.py:150
 msgid "You must supply a servings size"
-msgstr ""
+msgstr "Bir porsiyon büyüklüğü vermelisiniz"
 
 #: .\cookbook\helper\template_helper.py:95
 #: .\cookbook\helper\template_helper.py:97
 msgid "Could not parse template code."
-msgstr ""
+msgstr "Şablon kodu ayrıştırılamadı."
 
 #: .\cookbook\integration\copymethat.py:44
 #: .\cookbook\integration\melarecipes.py:37
 msgid "Favorite"
-msgstr ""
+msgstr "Favori"
 
 #: .\cookbook\integration\copymethat.py:50
 msgid "I made this"
-msgstr ""
+msgstr "Bunu yaptım"
 
 #: .\cookbook\integration\integration.py:209
 msgid ""
@@ -324,28 +326,28 @@ msgstr ""
 
 #: .\cookbook\integration\integration.py:217
 msgid "The following recipes were ignored because they already existed:"
-msgstr ""
+msgstr "Aşağıdaki tarifler zaten mevcut olduğu için göz ardı edildi:"
 
 #: .\cookbook\integration\integration.py:221
 #, python-format
 msgid "Imported %s recipes."
-msgstr ""
+msgstr "%s tarif içe aktarıldı."
 
 #: .\cookbook\integration\openeats.py:28
 msgid "Recipe source:"
-msgstr ""
+msgstr "Tarif kaynağı:"
 
 #: .\cookbook\integration\paprika.py:49
 msgid "Notes"
-msgstr ""
+msgstr "Notlar"
 
 #: .\cookbook\integration\paprika.py:52
 msgid "Nutritional Information"
-msgstr ""
+msgstr "Beslenme Bilgileri"
 
 #: .\cookbook\integration\paprika.py:56
 msgid "Source"
-msgstr ""
+msgstr "Kaynak"
 
 #: .\cookbook\integration\recettetek.py:54
 #: .\cookbook\integration\recipekeeper.py:70
@@ -354,23 +356,23 @@ msgstr ""
 
 #: .\cookbook\integration\saffron.py:23
 msgid "Servings"
-msgstr ""
+msgstr "Porsiyon"
 
 #: .\cookbook\integration\saffron.py:25
 msgid "Waiting time"
-msgstr ""
+msgstr "Bekleme süresi"
 
 #: .\cookbook\integration\saffron.py:27
 msgid "Preparation Time"
-msgstr ""
+msgstr "Hazırlık Süresi"
 
 #: .\cookbook\integration\saffron.py:29 .\cookbook\templates\index.html:7
 msgid "Cookbook"
-msgstr ""
+msgstr "Yemek kitabı"
 
 #: .\cookbook\integration\saffron.py:31
 msgid "Section"
-msgstr ""
+msgstr "Bölüm"
 
 #: .\cookbook\management\commands\fix_duplicate_properties.py:15
 msgid "Fixes foods with "
@@ -383,6 +385,8 @@ msgstr ""
 #: .\cookbook\management\commands\rebuildindex.py:18
 msgid "Only Postgresql databases use full text search, no index to rebuild"
 msgstr ""
+"Yalnızca Postgresql veritabanları tam metin araması kullanır, yeniden "
+"oluşturulacak dizin yoktur"
 
 #: .\cookbook\management\commands\rebuildindex.py:29
 msgid "Recipe index rebuild complete."

cookbook/locale/uk/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-01 15:04+0200\n"
-"PO-Revision-Date: 2024-11-22 07:58+0000\n"
-"Last-Translator: Oleh Hudyma <oleg.hudymaa@gmail.com>\n"
+"PO-Revision-Date: 2025-01-16 18:58+0000\n"
+"Last-Translator: Anton Shevtsov <ashevtsovs@gmail.com>\n"
 "Language-Team: Ukrainian <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/uk/>\n"
 "Language: uk\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 5.6.2\n"
+"X-Generator: Weblate 5.8.4\n"
 
 #: .\cookbook\forms.py:45
 msgid ""
@@ -32,7 +32,7 @@ msgstr ""
 
 #: .\cookbook\forms.py:62 .\cookbook\forms.py:246 .\cookbook\views\lists.py:103
 msgid "Keywords"
-msgstr ""
+msgstr "Ключові слова"
 
 #: .\cookbook\forms.py:62
 msgid "Preparation time in minutes"
@@ -941,13 +941,13 @@ msgstr ""
 #: .\cookbook\templates\ingredient_editor.html:7
 #: .\cookbook\templates\ingredient_editor.html:13
 msgid "Ingredient Editor"
-msgstr ""
+msgstr "Редактор Інгредієнтів"
 
 #: .\cookbook\templates\base.html:275
 #: .\cookbook\templates\export_response.html:7
 #: .\cookbook\templates\test2.html:14 .\cookbook\templates\test2.html:20
 msgid "Export"
-msgstr ""
+msgstr "Експорт"
 
 #: .\cookbook\templates\base.html:287
 msgid "Properties"

cookbook/migrations/0220_shoppinglistrecipe_created_by_and_more.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.18 on 2025-03-14 10:50
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+class Migration(migrations.Migration):
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('cookbook', '0219_connectorconfig_supports_description_field'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='shoppinglistrecipe',
+            name='created_by',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='shoppinglistrecipe',
+            name='space',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='cookbook.space'),
+        ),
+    ]

cookbook/migrations/0221_migrate_shoppinglistrecipe_space_created_by.py

@@ -0,0 +1,42 @@
+# Generated by Django 4.2.18 on 2025-03-14 10:50
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+from django.db.models import F, Count
+from django_scopes import scopes_disabled
+
+
+def add_space_and_owner_to_shopping_list_recipe(apps, schema_editor):
+    print('migrating shopping list recipe space attribute, this might take a while ...')
+    with scopes_disabled():
+        ShoppingListRecipe = apps.get_model('cookbook', 'ShoppingListRecipe')
+
+        # delete all shopping list recipes that do not have entries as those are of no use anyway
+        ShoppingListRecipe.objects.annotate(entry_count=Count('entries')).filter(entry_count__lte=0).delete()
+
+        shopping_list_recipes = ShoppingListRecipe.objects.all().prefetch_related('entries')
+        update_list = []
+
+        for slr in shopping_list_recipes:
+            if entry := slr.entries.first():
+                if entry.space and entry.created_by:
+                    slr.space = entry.space
+                    slr.created_by = entry.created_by
+                    update_list.append(slr)
+                else:
+                    print(slr, 'missing data on entry')
+            else:
+                print(slr, 'missing entry')
+
+        ShoppingListRecipe.objects.bulk_update(update_list, ['space', 'created_by'], batch_size=500)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('cookbook', '0220_shoppinglistrecipe_created_by_and_more'),
+    ]
+
+    operations = [
+        migrations.RunPython(add_space_and_owner_to_shopping_list_recipe),
+    ]

cookbook/migrations/0222_alter_shoppinglistrecipe_created_by_and_more.py

@@ -0,0 +1,26 @@
+# Generated by Django 4.2.18 on 2025-03-14 12:41
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('cookbook', '0221_migrate_shoppinglistrecipe_space_created_by'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='shoppinglistrecipe',
+            name='created_by',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='shoppinglistrecipe',
+            name='space',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.space'),
+        ),
+    ]

cookbook/models.py

@@ -126,7 +126,7 @@ class TreeModel(MP_Node):
         return None
 
     @property
-    def full_name(self):
+    def full_name(self) -> str:
         """
         Returns a string representation of a tree node and it's ancestors,
         e.g. 'Cuisine > Asian > Chinese > Catonese'.
@@ -912,12 +912,19 @@ class PropertyType(models.Model, PermissionModelMixin, MergeModelMixin):
     GOAL = 'GOAL'
     OTHER = 'OTHER'
 
+    CHOICES = (
+        (NUTRITION, _('Nutrition')),
+        (ALLERGEN, _('Allergen')),
+        (PRICE, _('Price')),
+        (GOAL, _('Goal')),
+        (OTHER, _('Other')),
+    )
+
     name = models.CharField(max_length=128)
     unit = models.CharField(max_length=64, blank=True, null=True)
     order = models.IntegerField(default=0)
     description = models.CharField(max_length=512, blank=True, null=True)
-    category = models.CharField(max_length=64, choices=((NUTRITION, _('Nutrition')), (ALLERGEN, _('Allergen')),
-                                                        (PRICE, _('Price')), (GOAL, _('Goal')), (OTHER, _('Other'))), null=True, blank=True)
+    category = models.CharField(max_length=64, choices=CHOICES, null=True, blank=True)
     open_data_slug = models.CharField(max_length=128, null=True, blank=True, default=None)
 
     fdc_id = models.IntegerField(null=True, default=None, blank=True)
@@ -1179,31 +1186,18 @@ class MealPlan(ExportModelOperationsMixin('meal_plan'), models.Model, Permission
 
 class ShoppingListRecipe(ExportModelOperationsMixin('shopping_list_recipe'), models.Model, PermissionModelMixin):
     name = models.CharField(max_length=32, blank=True, default='')
-    recipe = models.ForeignKey(Recipe, on_delete=models.CASCADE, null=True, blank=True)  # TODO make required after old shoppinglist deprecated
     servings = models.DecimalField(default=1, max_digits=8, decimal_places=4)
+    recipe = models.ForeignKey(Recipe, on_delete=models.CASCADE, null=True, blank=True)
     mealplan = models.ForeignKey(MealPlan, on_delete=models.CASCADE, null=True, blank=True)
 
-    objects = ScopedManager(space='recipe__space')
+    created_by = models.ForeignKey(User, on_delete=models.CASCADE)
+    space = models.ForeignKey(Space, on_delete=models.CASCADE)
 
-    @staticmethod
-    def get_space_key():
-        return 'recipe', 'space'
-
-    def get_space(self):
-        return self.recipe.space
+    objects = ScopedManager(space='space')
 
     def __str__(self):
         return f'Shopping list recipe {self.id} - {self.recipe}'
 
-    def get_owner(self):
-        try:
-            if not self.entries.exists():
-                return 'orphan'
-            else:
-                return getattr(self.entries.first(), 'created_by', None)
-        except AttributeError:
-            return None
-
 
 class ShoppingListEntry(ExportModelOperationsMixin('shopping_list_entry'), models.Model, PermissionModelMixin):
     list_recipe = models.ForeignKey(ShoppingListRecipe, on_delete=models.CASCADE, null=True, blank=True, related_name='entries')
@@ -1463,19 +1457,21 @@ class Automation(ExportModelOperationsMixin('automations'), models.Model, Permis
     UNIT_REPLACE = 'UNIT_REPLACE'
     NAME_REPLACE = 'NAME_REPLACE'
 
+    automation_types = (
+        (FOOD_ALIAS, _('Food Alias')),
+        (UNIT_ALIAS, _('Unit Alias')),
+        (KEYWORD_ALIAS, _('Keyword Alias')),
+        (DESCRIPTION_REPLACE, _('Description Replace')),
+        (INSTRUCTION_REPLACE, _('Instruction Replace')),
+        (NEVER_UNIT, _('Never Unit')),
+        (TRANSPOSE_WORDS, _('Transpose Words')),
+        (FOOD_REPLACE, _('Food Replace')),
+        (UNIT_REPLACE, _('Unit Replace')),
+        (NAME_REPLACE, _('Name Replace')),
+    )
+
     type = models.CharField(max_length=128,
-                            choices=(
-                                (FOOD_ALIAS, _('Food Alias')),
-                                (UNIT_ALIAS, _('Unit Alias')),
-                                (KEYWORD_ALIAS, _('Keyword Alias')),
-                                (DESCRIPTION_REPLACE, _('Description Replace')),
-                                (INSTRUCTION_REPLACE, _('Instruction Replace')),
-                                (NEVER_UNIT, _('Never Unit')),
-                                (TRANSPOSE_WORDS, _('Transpose Words')),
-                                (FOOD_REPLACE, _('Food Replace')),
-                                (UNIT_REPLACE, _('Unit Replace')),
-                                (NAME_REPLACE, _('Name Replace')),
-                            ))
+                            choices=automation_types)
     name = models.CharField(max_length=128, default='')
     description = models.TextField(blank=True, null=True)
 

cookbook/provider/local.py

@@ -12,21 +12,25 @@ class Local(Provider):
 
     @staticmethod
     def import_all(monitor):
+        if '/etc/' in monitor.path or '/root/' in monitor.path or '/mediafiles/' in monitor.path or '/usr/' in monitor.path:
+            return False
+
         files = [f for f in listdir(monitor.path) if isfile(join(monitor.path, f))]
 
         import_count = 0
         for file in files:
-            path = monitor.path + '/' + file
-            if not Recipe.objects.filter(file_path__iexact=path, space=monitor.space).exists() and not RecipeImport.objects.filter(file_path=path, space=monitor.space).exists():
-                name = os.path.splitext(file)[0]
-                new_recipe = RecipeImport(
-                    name=name,
-                    file_path=path,
-                    storage=monitor.storage,
-                    space=monitor.space,
-                )
-                new_recipe.save()
-                import_count += 1
+            if file.endswith('.pdf') or file.endswith('.png') or file.endswith('.jpg') or file.endswith('.jpeg') or file.endswith('.gif'):
+                path = monitor.path + '/' + file
+                if not Recipe.objects.filter(file_path__iexact=path, space=monitor.space).exists() and not RecipeImport.objects.filter(file_path=path, space=monitor.space).exists():
+                    name = os.path.splitext(file)[0]
+                    new_recipe = RecipeImport(
+                        name=name,
+                        file_path=path,
+                        storage=monitor.storage,
+                        space=monitor.space,
+                    )
+                    new_recipe.save()
+                    import_count += 1
 
         log_entry = SyncLog(
             status='SUCCESS',

cookbook/schemas.py

@@ -1,69 +0,0 @@
-from rest_framework.schemas.openapi import AutoSchema
-from rest_framework.schemas.utils import is_list_view
-
-
-class QueryParam(object):
-    def __init__(self, name, description=None, qtype='string', required=False):
-        self.name = name
-        self.description = description
-        self.qtype = qtype
-        self.required = required
-
-    def __str__(self):
-        return f'{self.name}, {self.qtype}, {self.description}'
-
-
-class QueryParamAutoSchema(AutoSchema):
-    def get_path_parameters(self, path, method):
-        if not is_list_view(path, method, self.view):
-            return super().get_path_parameters(path, method)
-        parameters = super().get_path_parameters(path, method)
-        for q in self.view.query_params:
-            parameters.append({
-                "name": q.name, "in": "query", "required": q.required,
-                "description": q.description,
-                'schema': {'type': q.qtype, },
-            })
-
-        return parameters
-
-
-class TreeSchema(AutoSchema):
-    def get_path_parameters(self, path, method):
-        if not is_list_view(path, method, self.view):
-            return super(TreeSchema, self).get_path_parameters(path, method)
-
-        api_name = path.split('/')[2]
-        parameters = super().get_path_parameters(path, method)
-        parameters.append({
-            "name": 'query', "in": "query", "required": False,
-            "description": 'Query string matched against {} name.'.format(api_name),
-            'schema': {'type': 'string', },
-        })
-        parameters.append({
-            "name": 'root', "in": "query", "required": False,
-            "description": 'Return first level children of {obj} with ID [int].  Integer 0 will return root {obj}s.'.format(
-                obj=api_name),
-            'schema': {'type': 'integer', },
-        })
-        parameters.append({
-            "name": 'tree', "in": "query", "required": False,
-            "description": 'Return all self and children of {} with ID [int].'.format(api_name),
-            'schema': {'type': 'integer', },
-        })
-        return parameters
-
-
-class FilterSchema(AutoSchema):
-    def get_path_parameters(self, path, method):
-        if not is_list_view(path, method, self.view):
-            return super(FilterSchema, self).get_path_parameters(path, method)
-
-        api_name = path.split('/')[2]
-        parameters = super().get_path_parameters(path, method)
-        parameters.append({
-            "name": 'query', "in": "query", "required": False,
-            "description": 'Query string matched against {} name.'.format(api_name),
-            'schema': {'type': 'string', },
-        })
-        return parameters

cookbook/serializer.py

@@ -4,7 +4,8 @@ from decimal import Decimal
 from gettext import gettext as _
 from html import escape
 from smtplib import SMTPException
-
+from drf_spectacular.utils import extend_schema_field
+from django.forms.models import model_to_dict
 from django.contrib.auth.models import AnonymousUser, Group, User
 from django.core.cache import caches
 from django.core.mail import send_mail
@@ -13,7 +14,8 @@ from django.http import BadHeaderError
 from django.urls import reverse
 from django.utils import timezone
 from django_scopes import scopes_disabled
-from drf_writable_nested import UniqueFieldsMixin, WritableNestedModelSerializer
+from drf_writable_nested import UniqueFieldsMixin
+from drf_writable_nested import WritableNestedModelSerializer as WNMS
 from oauth2_provider.models import AccessToken
 from PIL import Image
 from rest_framework import serializers
@@ -22,6 +24,7 @@ from rest_framework.fields import IntegerField
 
 from cookbook.helper.CustomStorageClass import CachedS3Boto3Storage
 from cookbook.helper.HelperFunctions import str2bool
+from cookbook.helper.image_processing import is_file_type_allowed
 from cookbook.helper.permission_helper import above_space_limit
 from cookbook.helper.property_helper import FoodPropertyHelper
 from cookbook.helper.shopping_helper import RecipeShoppingEditor
@@ -35,7 +38,34 @@ from cookbook.models import (Automation, BookmarkletImport, Comment, CookLog, Cu
                              SupermarketCategoryRelation, Sync, SyncLog, Unit, UnitConversion,
                              UserFile, UserPreference, UserSpace, ViewLog, ConnectorConfig)
 from cookbook.templatetags.custom_tags import markdown
-from recipes.settings import AWS_ENABLED, MEDIA_URL
+from recipes.settings import AWS_ENABLED, MEDIA_URL, EMAIL_HOST
+
+
+class WritableNestedModelSerializer(WNMS):
+
+    # overload to_internal_value to allow using PK only on nested object
+    def to_internal_value(self, data):
+        # iterate through every field on the posted object
+        for f in list(data):
+            if f not in self.fields:
+                continue
+            elif issubclass(self.fields[f].__class__, serializers.Serializer):
+                # if the field is a serializer and an integer, assume its an ID of an existing object
+                if isinstance(data[f], int):
+                    # only retrieve serializer required fields
+                    required_fields = ['id'] + [field_name for field_name, field in self.fields[f].__class__().fields.items() if field.required]
+                    data[f] = model_to_dict(self.fields[f].Meta.model.objects.get(id=data[f]), fields=required_fields)
+            elif issubclass(self.fields[f].__class__, serializers.ListSerializer):
+                # if the field is a ListSerializer get dict values of PKs provided
+                if any(isinstance(x, int) for x in data[f]):
+                    # only retrieve serializer required fields
+                    required_fields = ['id'] + [field_name for field_name, field in self.fields[f].child.__class__().fields.items() if field.required]
+                    # filter values to integer values
+                    pk_data = [x for x in data[f] if isinstance(x, int)]
+                    # merge non-pk values with retrieved values
+                    data[f] = [x for x in data[f] if not isinstance(x, int)] \
+                              + list(self.fields[f].child.Meta.model.objects.filter(id__in=pk_data).values(*required_fields))
+        return super().to_internal_value(data)
 
 
 class ExtendedRecipeMixin(serializers.ModelSerializer):
@@ -46,7 +76,7 @@ class ExtendedRecipeMixin(serializers.ModelSerializer):
     images = None
 
     image = serializers.SerializerMethodField('get_image')
-    numrecipe = serializers.ReadOnlyField(source='recipe_count')
+    numrecipe = serializers.IntegerField(source='recipe_count', read_only=True)
 
     def get_fields(self, *args, **kwargs):
         fields = super().get_fields(*args, **kwargs)
@@ -56,8 +86,7 @@ class ExtendedRecipeMixin(serializers.ModelSerializer):
             api_serializer = None
         # extended values are computationally expensive and not needed in normal circumstances
         try:
-            if str2bool(
-                    self.context['request'].query_params.get('extended', False)) and self.__class__ == api_serializer:
+            if str2bool(self.context['request'].query_params.get('extended', False)) and self.__class__ == api_serializer:
                 return fields
         except (AttributeError, KeyError):
             pass
@@ -91,6 +120,7 @@ class OpenDataModelMixin(serializers.ModelSerializer):
         return super().update(instance, validated_data)
 
 
+@extend_schema_field(float)
 class CustomDecimalField(serializers.Field):
     """
     Custom decimal field to normalize useless decimal places
@@ -114,6 +144,7 @@ class CustomDecimalField(serializers.Field):
                 raise ValidationError('A valid number is required')
 
 
+@extend_schema_field(bool)
 class CustomOnHandField(serializers.Field):
     def get_attribute(self, instance):
         return instance
@@ -122,16 +153,12 @@ class CustomOnHandField(serializers.Field):
         if not self.context["request"].user.is_authenticated:
             return []
         shared_users = []
-        if c := caches['default'].get(
-                f'shopping_shared_users_{self.context["request"].space.id}_{self.context["request"].user.id}', None):
+        if c := caches['default'].get(f'shopping_shared_users_{self.context["request"].space.id}_{self.context["request"].user.id}', None):
             shared_users = c
         else:
             try:
-                shared_users = [x.id for x in list(self.context['request'].user.get_shopping_share())] + [
-                    self.context['request'].user.id]
-                caches['default'].set(
-                    f'shopping_shared_users_{self.context["request"].space.id}_{self.context["request"].user.id}',
-                    shared_users, timeout=5 * 60)
+                shared_users = [x.id for x in list(self.context['request'].user.get_shopping_share())] + [self.context['request'].user.id]
+                caches['default'].set(f'shopping_shared_users_{self.context["request"].space.id}_{self.context["request"].user.id}', shared_users, timeout=5 * 60)
                 # TODO ugly hack that improves API performance significantly, should be done properly
             except AttributeError:  # Anonymous users (using share links) don't have shared users
                 pass
@@ -142,34 +169,39 @@ class CustomOnHandField(serializers.Field):
 
 
 class SpaceFilterSerializer(serializers.ListSerializer):
-
     def to_representation(self, data):
         if self.context.get('request', None) is None:
             return
+
         if (isinstance(data, QuerySet) and data.query.is_sliced):
             # if query is sliced it came from api request not nested serializer
             return super().to_representation(data)
+
         if self.child.Meta.model == User:
+            # Don't return User details to anonymous users
             if isinstance(self.context['request'].user, AnonymousUser):
                 data = []
             else:
                 data = data.filter(userspace__space=self.context['request'].user.get_active_space()).all()
+        elif isinstance(data, list):
+            data = [d for d in data if getattr(d, self.child.Meta.model.get_space_key()[0]) == self.context['request'].space]
         else:
-            data = data.filter(**{'__'.join(data.model.get_space_key()): self.context['request'].space})
+            data = data.filter(**{'__'.join(self.child.Meta.model.get_space_key()): self.context['request'].space})
         return super().to_representation(data)
 
 
 class UserSerializer(WritableNestedModelSerializer):
     display_name = serializers.SerializerMethodField('get_user_label')
 
+    @extend_schema_field(str)
     def get_user_label(self, obj):
         return obj.get_user_display_name()
 
     class Meta:
         list_serializer_class = SpaceFilterSerializer
         model = User
-        fields = ('id', 'username', 'first_name', 'last_name', 'display_name')
-        read_only_fields = ('username',)
+        fields = ('id', 'username', 'first_name', 'last_name', 'display_name', 'is_staff', 'is_superuser', 'is_active')
+        read_only_fields = ('id', 'username', 'display_name', 'is_staff', 'is_superuser', 'is_active')
 
 
 class GroupSerializer(UniqueFieldsMixin, WritableNestedModelSerializer):
@@ -182,6 +214,7 @@ class GroupSerializer(UniqueFieldsMixin, WritableNestedModelSerializer):
     class Meta:
         model = Group
         fields = ('id', 'name')
+        read_only_fields = ('id', 'name')
 
 
 class FoodInheritFieldSerializer(UniqueFieldsMixin, WritableNestedModelSerializer):
@@ -201,13 +234,16 @@ class FoodInheritFieldSerializer(UniqueFieldsMixin, WritableNestedModelSerialize
 
 
 class UserFileSerializer(serializers.ModelSerializer):
-    file = serializers.FileField(write_only=True)
+    created_by = UserSerializer(read_only=True)
+    file = serializers.FileField(write_only=True, required=False)
     file_download = serializers.SerializerMethodField('get_download_link')
     preview = serializers.SerializerMethodField('get_preview_link')
 
+    @extend_schema_field(serializers.CharField(read_only=True))
     def get_download_link(self, obj):
         return self.context['request'].build_absolute_uri(reverse('api_download_file', args={obj.pk}))
 
+    @extend_schema_field(serializers.CharField(read_only=True))
     def get_preview_link(self, obj):
         try:
             Image.open(obj.file.file.file)
@@ -233,29 +269,37 @@ class UserFileSerializer(serializers.ModelSerializer):
                 raise ValidationError(_('You have reached your file upload limit.'))
 
     def create(self, validated_data):
+        if not is_file_type_allowed(validated_data['file'].name):
+            return None
+
         self.check_file_limit(validated_data)
         validated_data['created_by'] = self.context['request'].user
         validated_data['space'] = self.context['request'].space
         return super().create(validated_data)
 
     def update(self, instance, validated_data):
+        if not is_file_type_allowed(validated_data['file'].name):
+            return None
         self.check_file_limit(validated_data)
         return super().update(instance, validated_data)
 
     class Meta:
         model = UserFile
-        fields = ('id', 'name', 'file', 'file_download', 'preview', 'file_size_kb')
-        read_only_fields = ('id', 'file_size_kb')
+        fields = ('id', 'name', 'file', 'file_download', 'preview', 'file_size_kb', 'created_by', 'created_at')
+        read_only_fields = ('id', 'file_download', 'preview', 'file_size_kb', 'created_by', 'created_at')
         extra_kwargs = {"file": {"required": False, }}
 
 
 class UserFileViewSerializer(serializers.ModelSerializer):
+    created_by = UserSerializer(read_only=True)
     file_download = serializers.SerializerMethodField('get_download_link')
     preview = serializers.SerializerMethodField('get_preview_link')
 
+    @extend_schema_field(str)
     def get_download_link(self, obj):
         return self.context['request'].build_absolute_uri(reverse('api_download_file', args={obj.pk}))
 
+    @extend_schema_field(str)
     def get_preview_link(self, obj):
         try:
             Image.open(obj.file.file.file)
@@ -272,11 +316,12 @@ class UserFileViewSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = UserFile
-        fields = ('id', 'name', 'file_download', 'preview')
-        read_only_fields = ('id', 'file')
+        fields = ('id', 'name', 'file_download', 'preview', 'file_size_kb', 'created_by', 'created_at')
+        read_only_fields = ('id', 'file', 'file_download', 'file_size_kb', 'preview', 'created_by', 'created_at')
 
 
 class SpaceSerializer(WritableNestedModelSerializer):
+    created_by = UserSerializer(read_only=True)
     user_count = serializers.SerializerMethodField('get_user_count')
     recipe_count = serializers.SerializerMethodField('get_recipe_count')
     file_size_mb = serializers.SerializerMethodField('get_file_size_mb')
@@ -292,12 +337,15 @@ class SpaceSerializer(WritableNestedModelSerializer):
     logo_color_512 = UserFileViewSerializer(required=False, many=False, allow_null=True)
     logo_color_svg = UserFileViewSerializer(required=False, many=False, allow_null=True)
 
+    @extend_schema_field(int)
     def get_user_count(self, obj):
         return UserSpace.objects.filter(space=obj).count()
 
+    @extend_schema_field(int)
     def get_recipe_count(self, obj):
         return Recipe.objects.filter(space=obj).count()
 
+    @extend_schema_field(float)
     def get_file_size_mb(self, obj):
         try:
             return UserFile.objects.filter(space=obj).aggregate(Sum('file_size_kb'))['file_size_kb__sum'] / 1000
@@ -360,15 +408,18 @@ class MealTypeSerializer(SpacedModelSerializer, WritableNestedModelSerializer):
 
 
 class UserPreferenceSerializer(WritableNestedModelSerializer):
+    user = UserSerializer(read_only=True)
     food_inherit_default = serializers.SerializerMethodField('get_food_inherit_defaults')
     plan_share = UserSerializer(many=True, allow_null=True, required=False)
     shopping_share = UserSerializer(many=True, allow_null=True, required=False)
     food_children_exist = serializers.SerializerMethodField('get_food_children_exist')
     image = UserFileViewSerializer(required=False, allow_null=True, many=False)
 
+    @extend_schema_field(FoodInheritFieldSerializer)
     def get_food_inherit_defaults(self, obj):
         return FoodInheritFieldSerializer(obj.user.get_active_space().food_inherit.all(), many=True).data
 
+    @extend_schema_field(bool)
     def get_food_children_exist(self, obj):
         space = getattr(self.context.get('request', None), 'space', None)
         return Food.objects.filter(depth__gt=0, space=space).exists()
@@ -393,6 +444,7 @@ class UserPreferenceSerializer(WritableNestedModelSerializer):
             'filter_to_supermarket', 'shopping_add_onhand', 'left_handed', 'show_step_ingredients',
             'food_children_exist'
         )
+        read_only_fields = ('user',)
 
 
 class StorageSerializer(SpacedModelSerializer):
@@ -455,22 +507,24 @@ class SyncLogSerializer(SpacedModelSerializer):
 class KeywordLabelSerializer(serializers.ModelSerializer):
     label = serializers.SerializerMethodField('get_label')
 
+    @extend_schema_field(str)
     def get_label(self, obj):
         return str(obj)
 
     class Meta:
         list_serializer_class = SpaceFilterSerializer
         model = Keyword
-        fields = (
-            'id', 'label',
-        )
+        fields = ('id', 'label')
         read_only_fields = ('id', 'label')
 
 
 class KeywordSerializer(UniqueFieldsMixin, ExtendedRecipeMixin):
-    label = serializers.SerializerMethodField('get_label')
+    label = serializers.SerializerMethodField('get_label', allow_null=False)
+    parent = IntegerField(read_only=True)
+
     recipe_filter = 'keywords'
 
+    @extend_schema_field(str)
     def get_label(self, obj):
         return str(obj)
 
@@ -594,8 +648,24 @@ class PropertySerializer(UniqueFieldsMixin, WritableNestedModelSerializer):
 class RecipeSimpleSerializer(WritableNestedModelSerializer):
     url = serializers.SerializerMethodField('get_url')
 
+    @extend_schema_field(str)
     def get_url(self, obj):
-        return reverse('view_recipe', args=[obj.id])
+        return f'recipe/{obj.pk}'
+
+    def create(self, validated_data):
+        # don't allow writing to Recipe via this API
+        return Recipe.objects.get(**validated_data)
+
+    def update(self, instance, validated_data):
+        # don't allow writing to Recipe via this API
+        return instance
+
+    class Meta:
+        model = Recipe
+        fields = ('id', 'name', 'url')
+
+
+class RecipeFlatSerializer(WritableNestedModelSerializer):
 
     def create(self, validated_data):
         # don't allow writing to Recipe via this API
@@ -607,7 +677,7 @@ class RecipeSimpleSerializer(WritableNestedModelSerializer):
 
     class Meta:
         model = Recipe
-        fields = ('id', 'name', 'url')
+        fields = ('id', 'name', 'image')
 
 
 class FoodSimpleSerializer(serializers.ModelSerializer):
@@ -619,12 +689,13 @@ class FoodSimpleSerializer(serializers.ModelSerializer):
 class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedRecipeMixin, OpenDataModelMixin):
     supermarket_category = SupermarketCategorySerializer(allow_null=True, required=False)
     recipe = RecipeSimpleSerializer(allow_null=True, required=False)
-    shopping = serializers.ReadOnlyField(source='shopping_status')
+    shopping = serializers.CharField(source='shopping_status', read_only=True)
     inherit_fields = FoodInheritFieldSerializer(many=True, allow_null=True, required=False)
     child_inherit_fields = FoodInheritFieldSerializer(many=True, allow_null=True, required=False)
     food_onhand = CustomOnHandField(required=False, allow_null=True)
     substitute_onhand = serializers.SerializerMethodField('get_substitute_onhand')
     substitute = FoodSimpleSerializer(many=True, allow_null=True, required=False)
+    parent = IntegerField(read_only=True)
 
     properties = PropertySerializer(many=True, allow_null=True, required=False)
     properties_food_unit = UnitSerializer(allow_null=True, required=False)
@@ -633,6 +704,7 @@ class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedR
     recipe_filter = 'steps__ingredients__food'
     images = ['recipe__image']
 
+    @extend_schema_field(bool)
     def get_substitute_onhand(self, obj):
         if not self.context["request"].user.is_authenticated:
             return []
@@ -730,12 +802,9 @@ class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedR
     class Meta:
         model = Food
         fields = (
-            'id', 'name', 'plural_name', 'description', 'shopping', 'recipe', 'url',
-            'properties', 'properties_food_amount', 'properties_food_unit', 'fdc_id',
-            'food_onhand', 'supermarket_category',
-            'image', 'parent', 'numchild', 'numrecipe', 'inherit_fields', 'full_name', 'ignore_shopping',
-            'substitute', 'substitute_siblings', 'substitute_children', 'substitute_onhand', 'child_inherit_fields',
-            'open_data_slug',
+            'id', 'name', 'plural_name', 'description', 'shopping', 'recipe', 'url', 'properties', 'properties_food_amount', 'properties_food_unit', 'fdc_id',
+            'food_onhand', 'supermarket_category', 'image', 'parent', 'numchild', 'numrecipe', 'inherit_fields', 'full_name', 'ignore_shopping',
+            'substitute', 'substitute_siblings', 'substitute_children', 'substitute_onhand', 'child_inherit_fields', 'open_data_slug',
         )
         read_only_fields = ('id', 'numchild', 'parent', 'image', 'numrecipe')
 
@@ -746,7 +815,9 @@ class IngredientSimpleSerializer(WritableNestedModelSerializer):
     used_in_recipes = serializers.SerializerMethodField('get_used_in_recipes')
     amount = CustomDecimalField()
     conversions = serializers.SerializerMethodField('get_conversions')
+    checked = serializers.BooleanField(read_only=True, default=False, help_text='Just laziness to have a checked field on the frontend API client')
 
+    @extend_schema_field(list)
     def get_used_in_recipes(self, obj):
         used_in = []
         for s in obj.step_set.all():
@@ -754,6 +825,7 @@ class IngredientSimpleSerializer(WritableNestedModelSerializer):
                 used_in.append({'id': r.id, 'name': r.name})
         return used_in
 
+    @extend_schema_field(list)
     def get_conversions(self, obj):
         if obj.unit and obj.food:
             uch = UnitConversionHelper(self.context['request'].space)
@@ -798,12 +870,16 @@ class StepSerializer(WritableNestedModelSerializer, ExtendedRecipeMixin):
         validated_data['space'] = self.context['request'].space
         return super().create(validated_data)
 
+    @extend_schema_field(str)
     def get_instructions_markdown(self, obj):
         return obj.get_instruction_render()
 
+    @extend_schema_field(serializers.ListField)
     def get_step_recipes(self, obj):
         return list(obj.recipe_set.values_list('id', flat=True).all())
 
+    # couldn't set proper serializer StepRecipeSerializer because of circular reference
+    @extend_schema_field(serializers.JSONField)
     def get_step_recipe_data(self, obj):
         # check if root type is recipe to prevent infinite recursion
         # can be improved later to allow multi level embedding
@@ -813,8 +889,7 @@ class StepSerializer(WritableNestedModelSerializer, ExtendedRecipeMixin):
     class Meta:
         model = Step
         fields = (
-            'id', 'name', 'instruction', 'ingredients', 'instructions_markdown',
-            'time', 'order', 'show_as_header', 'file', 'step_recipe',
+            'id', 'name', 'instruction', 'ingredients', 'instructions_markdown', 'time', 'order', 'show_as_header', 'file', 'step_recipe',
             'step_recipe_data', 'numrecipe', 'show_ingredients_table'
         )
 
@@ -824,9 +899,7 @@ class StepRecipeSerializer(WritableNestedModelSerializer):
 
     class Meta:
         model = Recipe
-        fields = (
-            'id', 'name', 'steps',
-        )
+        fields = ('id', 'name', 'steps')
 
 
 class UnitConversionSerializer(WritableNestedModelSerializer, OpenDataModelMixin):
@@ -837,6 +910,7 @@ class UnitConversionSerializer(WritableNestedModelSerializer, OpenDataModelMixin
     base_amount = CustomDecimalField()
     converted_amount = CustomDecimalField()
 
+    @extend_schema_field(str)
     def get_conversion_name(self, obj):
         text = f'{round(obj.base_amount)} {obj.base_unit} '
         if obj.food:
@@ -878,6 +952,7 @@ class NutritionInformationSerializer(serializers.ModelSerializer):
 
 class RecipeBaseSerializer(WritableNestedModelSerializer):
     # TODO make days of new recipe a setting
+    @extend_schema_field(bool)
     def is_recipe_new(self, obj):
         if getattr(obj, 'new_recipe', None) or obj.created_at > (timezone.now() - timedelta(days=7)):
             return True
@@ -893,12 +968,12 @@ class CommentSerializer(serializers.ModelSerializer):
 
 
 class RecipeOverviewSerializer(RecipeBaseSerializer):
-    keywords = KeywordLabelSerializer(many=True)
-    new = serializers.SerializerMethodField('is_recipe_new')
-    recent = serializers.ReadOnlyField()
-
-    rating = CustomDecimalField(required=False, allow_null=True)
-    last_cooked = serializers.DateTimeField(required=False, allow_null=True)
+    keywords = KeywordLabelSerializer(many=True, read_only=True)
+    new = serializers.SerializerMethodField('is_recipe_new', read_only=True)
+    recent = serializers.CharField(read_only=True)
+    rating = CustomDecimalField(required=False, allow_null=True, read_only=True)
+    last_cooked = serializers.DateTimeField(required=False, allow_null=True, read_only=True)
+    created_by = UserSerializer(read_only=True)
 
     def create(self, validated_data):
         pass
@@ -913,7 +988,14 @@ class RecipeOverviewSerializer(RecipeBaseSerializer):
             'waiting_time', 'created_by', 'created_at', 'updated_at',
             'internal', 'servings', 'servings_text', 'rating', 'last_cooked', 'new', 'recent'
         )
-        read_only_fields = ['image', 'created_by', 'created_at']
+        # TODO having these readonly fields makes "RecipeOverview.ts" (API Client) not generate the RecipeOverviewToJSON second else block which leads to errors when using the api
+        # TODO find a solution (custom schema?) to have these fields readonly (to save performance) and generate a proper client (two serializers would probably do the trick)
+        # read_only_fields = ['id', 'name', 'description', 'image', 'keywords', 'working_time',
+        #                     'waiting_time', 'created_by', 'created_at', 'updated_at',
+        #                     'internal', 'servings', 'servings_text', 'rating', 'last_cooked', 'new', 'recent']
+        read_only_fields = ['image', 'keywords', 'working_time',
+                            'waiting_time', 'created_by', 'created_at', 'updated_at',
+                            'internal', 'servings', 'servings_text', 'rating', 'last_cooked', 'new', 'recent']
 
 
 class RecipeSerializer(RecipeBaseSerializer):
@@ -925,7 +1007,9 @@ class RecipeSerializer(RecipeBaseSerializer):
     rating = CustomDecimalField(required=False, allow_null=True, read_only=True)
     last_cooked = serializers.DateTimeField(required=False, allow_null=True, read_only=True)
     food_properties = serializers.SerializerMethodField('get_food_properties')
+    created_by = UserSerializer(read_only=True)
 
+    @extend_schema_field(serializers.JSONField)
     def get_food_properties(self, obj):
         fph = FoodPropertyHelper(obj.space)  # initialize with object space since recipes might be viewed anonymously
         return fph.calculate_recipe_properties(obj)
@@ -933,12 +1017,9 @@ class RecipeSerializer(RecipeBaseSerializer):
     class Meta:
         model = Recipe
         fields = (
-            'id', 'name', 'description', 'image', 'keywords', 'steps', 'working_time',
-            'waiting_time', 'created_by', 'created_at', 'updated_at', 'source_url',
-            'internal', 'show_ingredient_overview', 'nutrition', 'properties', 'food_properties', 'servings',
-            'file_path', 'servings_text', 'rating',
-            'last_cooked',
-            'private', 'shared',
+            'id', 'name', 'description', 'image', 'keywords', 'steps', 'working_time', 'waiting_time', 'created_by', 'created_at', 'updated_at', 'source_url',
+            'internal', 'show_ingredient_overview', 'nutrition', 'properties', 'food_properties', 'servings', 'file_path', 'servings_text', 'rating',
+            'last_cooked', 'private', 'shared'
         )
         read_only_fields = ['image', 'created_by', 'created_at', 'food_properties']
 
@@ -958,6 +1039,16 @@ class RecipeImageSerializer(WritableNestedModelSerializer):
     image = serializers.ImageField(required=False, allow_null=True)
     image_url = serializers.CharField(max_length=4096, required=False, allow_null=True)
 
+    def create(self, validated_data):
+        if 'image' in validated_data and not is_file_type_allowed(validated_data['image'].name, image_only=True):
+            return None
+        return super().create(validated_data)
+
+    def update(self, instance, validated_data):
+        if 'image' in validated_data and not is_file_type_allowed(validated_data['image'].name, image_only=True):
+            return None
+        return super().update(instance, validated_data)
+
     class Meta:
         model = Recipe
         fields = ['image', 'image_url', ]
@@ -983,6 +1074,7 @@ class CustomFilterSerializer(SpacedModelSerializer, WritableNestedModelSerialize
 
 
 class RecipeBookSerializer(SpacedModelSerializer, WritableNestedModelSerializer):
+    created_by = UserSerializer(read_only=True)
     shared = UserSerializer(many=True)
     filter = CustomFilterSerializer(allow_null=True, required=False)
 
@@ -1000,9 +1092,11 @@ class RecipeBookEntrySerializer(serializers.ModelSerializer):
     book_content = serializers.SerializerMethodField(method_name='get_book_content', read_only=True)
     recipe_content = serializers.SerializerMethodField(method_name='get_recipe_content', read_only=True)
 
+    @extend_schema_field(RecipeBookSerializer)
     def get_book_content(self, obj):
         return RecipeBookSerializer(context={'request': self.context['request']}).to_representation(obj.book)
 
+    @extend_schema_field(RecipeOverviewSerializer)
     def get_recipe_content(self, obj):
         return RecipeOverviewSerializer(context={'request': self.context['request']}).to_representation(obj.recipe)
 
@@ -1022,19 +1116,22 @@ class RecipeBookEntrySerializer(serializers.ModelSerializer):
 
 class MealPlanSerializer(SpacedModelSerializer, WritableNestedModelSerializer):
     recipe = RecipeOverviewSerializer(required=False, allow_null=True)
-    recipe_name = serializers.ReadOnlyField(source='recipe.name')
+    recipe_name = serializers.CharField(source='recipe.name', read_only=True)
     meal_type = MealTypeSerializer()
-    meal_type_name = serializers.ReadOnlyField(source='meal_type.name')  # TODO deprecate once old meal plan was removed
+    meal_type_name = serializers.CharField(source='meal_type.name', read_only=True)  # TODO deprecate once old meal plan was removed
     note_markdown = serializers.SerializerMethodField('get_note_markdown')
     servings = CustomDecimalField()
     shared = UserSerializer(many=True, required=False, allow_null=True)
     shopping = serializers.SerializerMethodField('in_shopping')
+    addshopping = serializers.BooleanField(write_only=True, required=False)
 
     to_date = serializers.DateTimeField(required=False)
 
+    @extend_schema_field(str)
     def get_note_markdown(self, obj):
         return markdown(obj.note)
 
+    @extend_schema_field(bool)
     def in_shopping(self, obj):
         return ShoppingListRecipe.objects.filter(mealplan=obj.id).exists()
 
@@ -1044,18 +1141,31 @@ class MealPlanSerializer(SpacedModelSerializer, WritableNestedModelSerializer):
         if 'to_date' not in validated_data or validated_data['to_date'] is None:
             validated_data['to_date'] = validated_data['from_date']
 
+        add_to_shopping = False
+        try:
+            add_to_shopping = validated_data.pop('addshopping', False)
+        except KeyError:
+            pass
+
         mealplan = super().create(validated_data)
-        if self.context['request'].data.get('addshopping', False) and self.context['request'].data.get('recipe', None):
+        if add_to_shopping and self.context['request'].data.get('recipe', None):
             SLR = RecipeShoppingEditor(user=validated_data['created_by'], space=validated_data['space'])
             SLR.create(mealplan=mealplan, servings=validated_data['servings'])
         return mealplan
 
+    def update(self, obj, validated_data):
+        if sr := ShoppingListRecipe.objects.filter(mealplan=obj.id).first():
+            SLR = RecipeShoppingEditor(user=obj.created_by, space=obj.space, id=sr.id)
+            SLR.edit(mealplan=obj, servings=validated_data['servings'])
+
+        return super().update(obj, validated_data)
+
     class Meta:
         model = MealPlan
         fields = (
             'id', 'title', 'recipe', 'servings', 'note', 'note_markdown',
             'from_date', 'to_date', 'meal_type', 'created_by', 'shared', 'recipe_name',
-            'meal_type_name', 'shopping'
+            'meal_type_name', 'shopping', 'addshopping'
         )
         read_only_fields = ('created_by',)
 
@@ -1071,27 +1181,17 @@ class AutoMealPlanSerializer(serializers.Serializer):
 
 
 class ShoppingListRecipeSerializer(serializers.ModelSerializer):
-    name = serializers.SerializerMethodField('get_name')  # should this be done at the front end?
-    recipe_name = serializers.ReadOnlyField(source='recipe.name')
-    mealplan_note = serializers.ReadOnlyField(source='mealplan.note')
-    mealplan_from_date = serializers.ReadOnlyField(source='mealplan.from_date')
-    mealplan_type = serializers.ReadOnlyField(source='mealplan.meal_type.name')
+    recipe_data = RecipeOverviewSerializer(source='recipe', read_only=True, required=False)
+    meal_plan_data = MealPlanSerializer(source='mealplan', read_only=True, required=False)
     servings = CustomDecimalField()
+    created_by = UserSerializer(read_only=True)
 
-    def get_name(self, obj):
-        if not isinstance(value := obj.servings, Decimal):
-            value = Decimal(value)
-        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})'
+    def create(self, validated_data):
+        validated_data['space'] = self.context['request'].space
+        validated_data['created_by'] = self.context['request'].user
+        return super().create(validated_data)
 
     def update(self, instance, validated_data):
-        # TODO remove once old shopping list
         if 'servings' in validated_data and self.context.get('view', None).__class__.__name__ != 'ShoppingListViewSet':
             SLR = RecipeShoppingEditor(user=self.context['request'].user, space=self.context['request'].space)
             SLR.edit_servings(servings=validated_data['servings'], id=instance.id)
@@ -1099,18 +1199,19 @@ class ShoppingListRecipeSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = ShoppingListRecipe
-        fields = ('id', 'recipe_name', 'name', 'recipe', 'mealplan', 'servings', 'mealplan_note', 'mealplan_from_date',
-                  'mealplan_type')
-        read_only_fields = ('id',)
+        fields = ('id', 'name', 'recipe', 'recipe_data', 'mealplan', 'meal_plan_data', 'servings', 'created_by',)
+        read_only_fields = ('id', 'created_by',)
 
 
 class ShoppingListEntrySerializer(WritableNestedModelSerializer):
     food = FoodSerializer(allow_null=True)
     unit = UnitSerializer(allow_null=True, required=False)
-    recipe_mealplan = ShoppingListRecipeSerializer(source='list_recipe', read_only=True)
+    list_recipe_data = ShoppingListRecipeSerializer(source='list_recipe', read_only=True)
     amount = CustomDecimalField()
     created_by = UserSerializer(read_only=True)
     completed_at = serializers.DateTimeField(allow_null=True, required=False)
+    mealplan_id = serializers.IntegerField(required=False, write_only=True,
+                                           help_text='If a mealplan id is given try to find existing or create new ShoppingListRecipe with that meal plan and link entry to it')
 
     def get_fields(self, *args, **kwargs):
         fields = super().get_fields(*args, **kwargs)
@@ -1144,31 +1245,56 @@ class ShoppingListEntrySerializer(WritableNestedModelSerializer):
     def create(self, validated_data):
         validated_data['space'] = self.context['request'].space
         validated_data['created_by'] = self.context['request'].user
+
+        if 'mealplan_id' in validated_data:
+            if existing_slr := ShoppingListRecipe.objects.filter(mealplan_id=validated_data['mealplan_id'], space=self.context['request'].space).first():
+                validated_data['list_recipe'] = existing_slr
+            else:
+                validated_data['list_recipe'] = ShoppingListRecipe.objects.create(mealplan_id=validated_data['mealplan_id'], space=self.context['request'].space,
+                                                                                  created_by=self.context['request'].user)
+            del validated_data['mealplan_id']
+
         return super().create(validated_data)
 
     def update(self, instance, validated_data):
         user = self.context['request'].user
+
+        if 'mealplan_id' in validated_data:
+            del validated_data['mealplan_id']
+
         # update the onhand for food if shopping_add_onhand is True
         if user.userpreference.shopping_add_onhand:
             if checked := validated_data.get('checked', None):
+                validated_data['completed_at'] = timezone.now()
                 instance.food.onhand_users.add(*user.userpreference.shopping_share.all(), user)
-            elif checked == False:
+            elif not checked:
                 instance.food.onhand_users.remove(*user.userpreference.shopping_share.all(), user)
         return super().update(instance, validated_data)
 
     class Meta:
         model = ShoppingListEntry
         fields = (
-            'id', 'list_recipe', 'food', 'unit', 'amount', 'order', 'checked',
-            'recipe_mealplan',
-            'created_by', 'created_at', 'updated_at', 'completed_at', 'delay_until'
+            'id', 'list_recipe', 'food', 'unit', 'amount', 'order', 'checked', 'ingredient',
+            'list_recipe_data', 'created_by', 'created_at', 'updated_at', 'completed_at', 'delay_until', 'mealplan_id'
         )
-        read_only_fields = ('id', 'created_by', 'created_at', 'updated_at',)
+        read_only_fields = ('id', 'created_by', 'created_at')
+
+
+class ShoppingListEntrySimpleCreateSerializer(serializers.Serializer):
+    amount = CustomDecimalField()
+    unit_id = serializers.IntegerField(allow_null=True)
+    food_id = serializers.IntegerField(allow_null=True)
+    ingredient_id = serializers.IntegerField(allow_null=True)
+
+
+class ShoppingListEntryBulkCreateSerializer(serializers.Serializer):
+    entries = serializers.ListField(child=ShoppingListEntrySimpleCreateSerializer())
 
 
 class ShoppingListEntryBulkSerializer(serializers.Serializer):
     ids = serializers.ListField()
     checked = serializers.BooleanField()
+    timestamp = serializers.DateTimeField(read_only=True, required=False)
 
 
 # TODO deprecate
@@ -1202,7 +1328,13 @@ class ViewLogSerializer(serializers.ModelSerializer):
     def create(self, validated_data):
         validated_data['created_by'] = self.context['request'].user
         validated_data['space'] = self.context['request'].space
-        return super().create(validated_data)
+
+        view_log = ViewLog.objects.filter(recipe=validated_data['recipe'], created_by=self.context['request'].user, created_at__gt=(timezone.now() - timezone.timedelta(minutes=5)),
+                                          space=self.context['request'].space).first()
+        if not view_log:
+            view_log = ViewLog.objects.create(recipe=validated_data['recipe'], created_by=self.context['request'].user, space=self.context['request'].space)
+
+        return view_log
 
     class Meta:
         model = ViewLog
@@ -1263,7 +1395,7 @@ class InviteLinkSerializer(WritableNestedModelSerializer):
         validated_data['space'] = self.context['request'].space
         obj = super().create(validated_data)
 
-        if obj.email:
+        if obj.email and EMAIL_HOST != '':
             try:
                 if InviteLink.objects.filter(space=self.context['request'].space,
                                              created_at__gte=datetime.now() - timedelta(hours=4)).count() < 20:
@@ -1331,9 +1463,13 @@ class AccessTokenSerializer(serializers.ModelSerializer):
         validated_data['user'] = self.context['request'].user
         return super().create(validated_data)
 
+    @extend_schema_field(str)
     def get_token(self, obj):
         if (timezone.now() - obj.created).seconds < 15:
             return obj.token
+        if obj.scope == 'bookmarklet':
+            # bookmarklet only tokens are always returned because they have very limited access and are needed for the bookmarklet function to work
+            return obj.token
         return f'tda_************_******_***********{obj.token[len(obj.token) - 4:]}'
 
     class Meta:
@@ -1342,6 +1478,45 @@ class AccessTokenSerializer(serializers.ModelSerializer):
         read_only_fields = ('id', 'token',)
 
 
+class LocalizationSerializer(serializers.Serializer):
+    code = serializers.CharField(max_length=8, read_only=True)
+    language = serializers.CharField(read_only=True)
+
+    class Meta:
+        fields = '__ALL__'
+
+
+class ServerSettingsSerializer(serializers.Serializer):
+    # TODO add all other relevant settings including path/url related ones?
+    shopping_min_autosync_interval = serializers.CharField()
+    enable_pdf_export = serializers.BooleanField()
+    enable_ai_import = serializers.BooleanField()
+    disable_external_connectors = serializers.BooleanField()
+    terms_url = serializers.CharField()
+    privacy_url = serializers.CharField()
+    imprint_url = serializers.CharField()
+    hosted = serializers.BooleanField()
+    debug = serializers.BooleanField()
+    version = serializers.CharField()
+
+    class Meta:
+        fields = '__ALL__'
+        read_only_fields = '__ALL__'
+
+
+class FdcQueryFoodsSerializer(serializers.Serializer):
+    fdcId = serializers.IntegerField()
+    description = serializers.CharField()
+    dataType = serializers.CharField()
+
+
+class FdcQuerySerializer(serializers.Serializer):
+    totalHits = serializers.IntegerField()
+    currentPage = serializers.IntegerField()
+    totalPages = serializers.IntegerField()
+    foods = FdcQueryFoodsSerializer(many=True)
+
+
 # Export/Import Serializers
 
 class KeywordExportSerializer(KeywordSerializer):
@@ -1424,8 +1599,8 @@ class RecipeExportSerializer(WritableNestedModelSerializer):
 class RecipeShoppingUpdateSerializer(serializers.ModelSerializer):
     list_recipe = serializers.IntegerField(write_only=True, allow_null=True, required=False,
                                            help_text=_("Existing shopping list to update"))
-    ingredients = serializers.IntegerField(write_only=True, allow_null=True, required=False, help_text=_(
-        "List of ingredient IDs from the recipe to add, if not provided all ingredients will be added."))
+    ingredients = serializers.ListField(child=serializers.IntegerField(write_only=True, allow_null=True, required=False, help_text=_(
+        "List of ingredient IDs from the recipe to add, if not provided all ingredients will be added.")))
     servings = serializers.IntegerField(default=1, write_only=True, allow_null=True, required=False, help_text=_(
         "Providing a list_recipe ID and servings of 0 will delete that shopping list."))
 
@@ -1453,3 +1628,130 @@ class RecipeFromSourceSerializer(serializers.Serializer):
     url = serializers.CharField(max_length=4096, required=False, allow_null=True, allow_blank=True)
     data = serializers.CharField(required=False, allow_null=True, allow_blank=True)
     bookmarklet = serializers.IntegerField(required=False, allow_null=True, )
+
+
+class SourceImportFoodSerializer(serializers.Serializer):
+    name = serializers.CharField()
+
+
+class SourceImportUnitSerializer(serializers.Serializer):
+    name = serializers.CharField()
+
+
+class SourceImportIngredientSerializer(serializers.Serializer):
+    amount = serializers.FloatField()
+    food = SourceImportFoodSerializer()
+    unit = SourceImportUnitSerializer()
+    note = serializers.CharField(required=False)
+    original_text = serializers.CharField()
+
+
+class SourceImportStepSerializer(serializers.Serializer):
+    instruction = serializers.CharField()
+    ingredients = SourceImportIngredientSerializer(many=True)
+    show_ingredients_table = serializers.BooleanField(default=True)
+
+
+class SourceImportKeywordSerializer(serializers.Serializer):
+    id = serializers.IntegerField(allow_null=True)
+    label = serializers.CharField()
+    name = serializers.CharField()
+    import_keyword = serializers.BooleanField(default=True)
+
+
+class SourceImportPropertyTypeSerializer(serializers.Serializer):
+    id = serializers.IntegerField()
+    name = serializers.CharField()
+
+
+class SourceImportPropertySerializer(serializers.Serializer):
+    property_type = SourceImportPropertyTypeSerializer(many=False)
+    property_amount = serializers.FloatField()
+
+
+class SourceImportRecipeSerializer(serializers.Serializer):
+    steps = SourceImportStepSerializer(many=True)
+    internal = serializers.BooleanField(default=True)
+    source_url = serializers.URLField()
+    name = serializers.CharField()
+    description = serializers.CharField(default=None)
+    servings = serializers.IntegerField(default=1)
+    servings_text = serializers.CharField(default='')
+    working_time = serializers.IntegerField(default=0)
+    waiting_time = serializers.IntegerField(default=0)
+    image_url = serializers.URLField(default=None)
+    keywords = SourceImportKeywordSerializer(many=True, default=[])
+
+    properties = serializers.ListField(child=SourceImportPropertySerializer(), default=[])
+
+
+class SourceImportDuplicateSerializer(serializers.Serializer):
+    id = serializers.IntegerField()
+    name = serializers.CharField()
+
+
+class RecipeFromSourceResponseSerializer(serializers.Serializer):
+    recipe = SourceImportRecipeSerializer(default=None)
+    recipe_id = serializers.IntegerField(default=None)
+    images = serializers.ListField(child=serializers.CharField(), default=[], allow_null=False)
+    error = serializers.BooleanField(default=False)
+    msg = serializers.CharField(max_length=1024, default='')
+    duplicates = serializers.ListField(child=SourceImportDuplicateSerializer(), default=[], allow_null=False)
+
+
+class AiImportSerializer(serializers.Serializer):
+    file = serializers.FileField(allow_null=True)
+    text = serializers.CharField(allow_null=True, allow_blank=True)
+
+
+class ImportOpenDataSerializer(serializers.Serializer):
+    selected_version = serializers.CharField()
+    selected_datatypes = serializers.ListField(child=serializers.CharField())
+    update_existing = serializers.BooleanField(default=True)
+    use_metric = serializers.BooleanField(default=True)
+
+
+class ImportOpenDataResponseDetailSerializer(serializers.Serializer):
+    total_created = serializers.IntegerField(default=0)
+    total_updated = serializers.IntegerField(default=0)
+    total_untouched = serializers.IntegerField(default=0)
+    total_errored = serializers.IntegerField(default=0)
+
+class ImportOpenDataResponseSerializer(serializers.Serializer):
+    food = ImportOpenDataResponseDetailSerializer(required=False)
+    unit = ImportOpenDataResponseDetailSerializer(required=False)
+    category = ImportOpenDataResponseDetailSerializer(required=False)
+    property = ImportOpenDataResponseDetailSerializer(required=False)
+    store = ImportOpenDataResponseDetailSerializer(required=False)
+    conversion = ImportOpenDataResponseDetailSerializer(required=False)
+
+class ImportOpenDataVersionMetaDataSerializer(serializers.Serializer):
+    food = serializers.IntegerField()
+    unit = serializers.IntegerField()
+    category = serializers.IntegerField()
+    property = serializers.IntegerField()
+    store = serializers.IntegerField()
+    conversion = serializers.IntegerField()
+
+class ImportOpenDataMetaDataSerializer(serializers.Serializer):
+    versions = serializers.ListField(child=serializers.CharField())
+    datatypes = serializers.ListField(child=serializers.CharField())
+
+    base = ImportOpenDataVersionMetaDataSerializer()
+    cs = ImportOpenDataVersionMetaDataSerializer()
+    da = ImportOpenDataVersionMetaDataSerializer()
+    de = ImportOpenDataVersionMetaDataSerializer()
+    el = ImportOpenDataVersionMetaDataSerializer()
+    en = ImportOpenDataVersionMetaDataSerializer()
+    es = ImportOpenDataVersionMetaDataSerializer()
+    fr = ImportOpenDataVersionMetaDataSerializer()
+    hu = ImportOpenDataVersionMetaDataSerializer()
+    it = ImportOpenDataVersionMetaDataSerializer()
+    nb_NO = ImportOpenDataVersionMetaDataSerializer()
+    nl = ImportOpenDataVersionMetaDataSerializer()
+    pl = ImportOpenDataVersionMetaDataSerializer()
+    pt = ImportOpenDataVersionMetaDataSerializer()
+    pt_BR = ImportOpenDataVersionMetaDataSerializer()
+    sk = ImportOpenDataVersionMetaDataSerializer()
+    sl = ImportOpenDataVersionMetaDataSerializer()
+    zh_Hans = ImportOpenDataVersionMetaDataSerializer()

cookbook/signals.py

@@ -120,37 +120,6 @@ def update_food_inheritance(sender, instance=None, created=False, **kwargs):
         child.save()
 
 
-@receiver(post_save, sender=MealPlan)
-def auto_add_shopping(sender, instance=None, created=False, weak=False, **kwargs):
-    print("MEAL_AUTO_ADD Signal trying to auto add to shopping")
-    if not instance:
-        print("MEAL_AUTO_ADD Instance is none")
-        return
-
-    try:
-        space = instance.get_space()
-        user = instance.get_owner()
-        with scope(space=space):
-            slr_exists = instance.shoppinglistrecipe_set.exists()
-
-        if not created and slr_exists:
-            for x in instance.shoppinglistrecipe_set.all():
-                # assuming that permissions checks for the MealPlan have happened upstream
-                if instance.servings != x.servings:
-                    SLR = RecipeShoppingEditor(id=x.id, user=user, space=instance.space)
-                    SLR.edit_servings(servings=instance.servings)
-        elif not user.userpreference.mealplan_autoadd_shopping or not instance.recipe:
-            print("MEAL_AUTO_ADD No recipe or no setting")
-            return
-
-        if created:
-            SLR = RecipeShoppingEditor(user=user, space=space)
-            SLR.create(mealplan=instance, servings=instance.servings)
-            print("MEAL_AUTO_ADD Created SLR")
-    except AttributeError:
-        pass
-
-
 @receiver(post_save, sender=Unit)
 def clear_unit_cache(sender, instance=None, created=False, **kwargs):
     if instance:

cookbook/static/assets/logo_color_plan.svg

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1"
+	 id="svg48" inkscape:export-xdpi="48" inkscape:export-ydpi="48" sodipodi:docname="logo_color_shopping.svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:serif="http://www.serif.com/" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 558.1 558.1"
+	 style="enable-background:new 0 0 558.1 558.1;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:url(#ellipse2_00000062882008473870802360000001235346600214014370_);}
+	.st1{clip-path:url(#SVGID_00000040562990235419179500000014537515251997333940_);}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#161616;}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:#FFCB76;}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:#FF6F00;}
+	.st5{clip-path:url(#SVGID_00000026884998257896383920000012290328997039565247_);}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:#FFD100;}
+	.st7{fill:#161616;}
+</style>
+<sodipodi:namedview  bordercolor="#666666" borderopacity="1" gridtolerance="10" guidetolerance="10" id="namedview50" inkscape:current-layer="svg48" inkscape:cx="256" inkscape:cy="256" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-height="1377" inkscape:window-maximized="1" inkscape:window-width="2560" inkscape:window-x="2552" inkscape:window-y="-8" inkscape:zoom="2.0039062" objecttolerance="10" pagecolor="#ffffff" showgrid="false">
+	</sodipodi:namedview>
+<g id="Kreis" transform="matrix(0.92371046,0,0,0.95776263,3.7134303,-54.329713)">
+	
+		<linearGradient id="ellipse2_00000072976586691886204630000005673338158137684613_" gradientUnits="userSpaceOnUse" x1="-24.1585" y1="348.0664" x2="-23.1585" y2="348.0664" gradientTransform="matrix(2.147900e-06 0 0 -2.227081e-06 4347.1548 66.3621)">
+		<stop  offset="0" style="stop-color:#272727"/>
+		<stop  offset="1" style="stop-color:#6C6C6C"/>
+	</linearGradient>
+	
+		<ellipse id="ellipse2" style="fill-rule:evenodd;clip-rule:evenodd;fill:url(#ellipse2_00000072976586691886204630000005673338158137684613_);" cx="298.1" cy="348.1" rx="302.1" ry="291.3"/>
+	<g>
+		<defs>
+			<circle id="SVGID_1_" cx="298.1" cy="348.1" r="279"/>
+		</defs>
+		<clipPath id="SVGID_00000080899089203538361760000014164288875061347472_">
+			<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+		</clipPath>
+		<g id="g18" style="clip-path:url(#SVGID_00000080899089203538361760000014164288875061347472_);">
+			<g id="Shadow" transform="matrix(1.10322,0,0,1.064,-5.58287,50.5786)">
+				<path id="path7" class="st2" d="M163.2,477.5l271.2,271.2L759.1,557L416.4,214.2L163.2,477.5z"/>
+				<g id="g11" transform="translate(-4.22105,0.775864)">
+					<path id="path9" class="st2" d="M223.4,188.6L545.8,511l121-106.1L326,64.1l-3.2,78.4L223.4,188.6z"/>
+				</g>
+				<g id="g15" transform="translate(-85.3876,27.8512)">
+					<path id="path13" class="st2" d="M328.5,154.7l322.4,322.4l3.1-71.6L313.3,64.7l-3.6,82.2L328.5,154.7z"/>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+<g id="g23" transform="matrix(0.93750213,0,0,0.93750213,15.953517,15.99888)">
+	<path id="path21" class="st3" d="M280.6,238.7c35.1,0,65.8-14.8,85.3-30.1c19.7-15.6,48.3-12.5,64.2,6.9
+		c26.2,31.7,41.8,71.9,41.8,115.6c0,71.6-44.2,159.9-105.6,190.9c-26.4,13.3-53.8,19.6-85.6,19.6l0,0h-0.1h-0.1l0,0
+		c-31.8,0-59.2-6.3-85.6-19.6C133.5,491.1,89.3,402.7,89.3,331.2c0-43.7,15.7-83.9,41.8-115.6c15.9-19.4,44.5-22.5,64.2-6.9
+		C214.8,224,245.5,238.7,280.6,238.7L280.6,238.7z"/>
+</g>
+<g id="Flame-2" transform="matrix(0.61547875,0,0,0.56833279,-138.25728,-438.60298)" serif:id="Flame 2">
+	<path id="path25" class="st4" d="M636,823.4c-2.8-4-2.8-9.6-0.1-13.7c2.8-4.1,7.7-5.6,12.1-3.9c22.2,8.9,51.2,22.5,73.8,40.9
+		c46.9,38.3,59.7,63.9,70.2,90.3c12.4,31.2,14.2,63.5,11.6,86c-7.6,64.6-56,117.9-125,117.9c-69,0-123.9-52.8-125-117.9
+		c-0.7-39.2,12.1-70.5,26.1-92.8c3.5-5.6,10-7.8,15.8-5.6c5.8,2.3,9.5,8.6,8.8,15.3c-2,14.1-3.3,28.8-2.7,40.6
+		c2.2,39.8,25.9,50,50.2,49.8c25.9-0.2,52.1-22.2,42.7-78.4C686.3,902.9,656.8,853.5,636,823.4L636,823.4z"/>
+	<g>
+		<defs>
+			<path id="SVGID_00000067227953264718972400000007310393595166440114_" d="M636,823.4c-2.8-4-2.8-9.6-0.1-13.7
+				c2.8-4.1,7.7-5.6,12.1-3.9c22.2,8.9,51.2,22.5,73.8,40.9c46.9,38.3,59.7,63.9,70.2,90.3c12.4,31.2,14.2,63.5,11.6,86
+				c-7.6,64.6-56,117.9-125,117.9c-69,0-123.9-52.8-125-117.9c-0.7-39.2,12.1-70.5,26.1-92.8c3.5-5.6,10-7.8,15.8-5.6
+				c5.8,2.3,9.5,8.6,8.8,15.3c-2,14.1-3.3,28.8-2.7,40.6c2.2,39.8,25.9,50,50.2,49.8c25.9-0.2,52.1-22.2,42.7-78.4
+				C686.3,902.9,656.8,853.5,636,823.4L636,823.4z"/>
+		</defs>
+		<clipPath id="SVGID_00000178886517717031376290000002615817110574070691_">
+			<use xlink:href="#SVGID_00000067227953264718972400000007310393595166440114_"  style="overflow:visible;"/>
+		</clipPath>
+		<g id="g34" style="clip-path:url(#SVGID_00000178886517717031376290000002615817110574070691_);">
+			<g id="g32" transform="matrix(1.28784,-0.270602,0.285942,1.59598,247.349,825.209)">
+				<path id="path30" class="st6" d="M279.8,36.7c28.5,13.5,59.3,44.8,67.8,85.1c14.1,67-25.3,85.6-59.1,84
+					c-54.2-2.6-72.4-45.5-36.2-97.1C274.8,76.8,253.9,24.5,279.8,36.7z"/>
+			</g>
+		</g>
+	</g>
+</g>
+<path class="st7" d="M245.7,280.1c6.2,0,11.1,5,11.1,11.1v11.1h44.5v-11.1c0-6.2,5-11.1,11.1-11.1s11.1,5,11.1,11.1v11.1h16.7
+	c9.2,0,16.7,7.5,16.7,16.7v16.7H201.2V319c0-9.2,7.5-16.7,16.7-16.7h16.7v-11.1C234.5,285,239.5,280.1,245.7,280.1z M201.2,346.8
+	h155.8v94.6c0,9.2-7.5,16.7-16.7,16.7H217.8c-9.2,0-16.7-7.5-16.7-16.7V346.8z M223.4,374.6v11.1c0,3.1,2.5,5.6,5.6,5.6h11.1
+	c3.1,0,5.6-2.5,5.6-5.6v-11.1c0-3.1-2.5-5.6-5.6-5.6H229C225.9,369.1,223.4,371.6,223.4,374.6z M267.9,374.6v11.1
+	c0,3.1,2.5,5.6,5.6,5.6h11.1c3.1,0,5.6-2.5,5.6-5.6v-11.1c0-3.1-2.5-5.6-5.6-5.6h-11.1C270.4,369.1,267.9,371.6,267.9,374.6z
+	 M318,369.1c-3.1,0-5.6,2.5-5.6,5.6v11.1c0,3.1,2.5,5.6,5.6,5.6h11.1c3.1,0,5.6-2.5,5.6-5.6v-11.1c0-3.1-2.5-5.6-5.6-5.6H318z
+	 M223.4,419.1v11.1c0,3.1,2.5,5.6,5.6,5.6h11.1c3.1,0,5.6-2.5,5.6-5.6v-11.1c0-3.1-2.5-5.6-5.6-5.6H229
+	C225.9,413.6,223.4,416.1,223.4,419.1z M273.5,413.6c-3.1,0-5.6,2.5-5.6,5.6v11.1c0,3.1,2.5,5.6,5.6,5.6h11.1c3.1,0,5.6-2.5,5.6-5.6
+	v-11.1c0-3.1-2.5-5.6-5.6-5.6H273.5z M312.4,419.1v11.1c0,3.1,2.5,5.6,5.6,5.6h11.1c3.1,0,5.6-2.5,5.6-5.6v-11.1
+	c0-3.1-2.5-5.6-5.6-5.6H318C314.9,413.6,312.4,416.1,312.4,419.1z"/>
+</svg>

cookbook/static/assets/logo_color_shopping.svg

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1"
+	 id="svg48" inkscape:export-xdpi="48" inkscape:export-ydpi="48" sodipodi:docname="logo_color_shopping.svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:serif="http://www.serif.com/" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 558.1 558.1"
+	 style="enable-background:new 0 0 558.1 558.1;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:url(#ellipse2_00000123406314579419878720000015292012387505797789_);}
+	.st1{clip-path:url(#SVGID_00000069378195777491616980000011609770225407185072_);}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#161616;}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:#FFCB76;}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:#FF6F00;}
+	.st5{clip-path:url(#SVGID_00000129168706913539839680000006972943119257724314_);}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:#FFD100;}
+</style>
+<sodipodi:namedview  bordercolor="#666666" borderopacity="1" gridtolerance="10" guidetolerance="10" id="namedview50" inkscape:current-layer="svg48" inkscape:cx="256" inkscape:cy="256" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-height="1377" inkscape:window-maximized="1" inkscape:window-width="2560" inkscape:window-x="2552" inkscape:window-y="-8" inkscape:zoom="2.0039062" objecttolerance="10" pagecolor="#ffffff" showgrid="false">
+	</sodipodi:namedview>
+<g id="Kreis" transform="matrix(0.92371046,0,0,0.95776263,3.7134303,-54.329713)">
+	
+		<linearGradient id="ellipse2_00000092432231847401152480000013557045245219773118_" gradientUnits="userSpaceOnUse" x1="-24.1585" y1="348.0664" x2="-23.1585" y2="348.0664" gradientTransform="matrix(2.147900e-06 0 0 -2.227081e-06 4347.1548 66.3621)">
+		<stop  offset="0" style="stop-color:#272727"/>
+		<stop  offset="1" style="stop-color:#6C6C6C"/>
+	</linearGradient>
+	
+		<ellipse id="ellipse2" style="fill-rule:evenodd;clip-rule:evenodd;fill:url(#ellipse2_00000092432231847401152480000013557045245219773118_);" cx="298.1" cy="348.1" rx="302.1" ry="291.3"/>
+	<g>
+		<defs>
+			<circle id="SVGID_1_" cx="298.1" cy="348.1" r="279"/>
+		</defs>
+		<clipPath id="SVGID_00000078750348294658121660000005213362532985289101_">
+			<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+		</clipPath>
+		<g id="g18" style="clip-path:url(#SVGID_00000078750348294658121660000005213362532985289101_);">
+			<g id="Shadow" transform="matrix(1.10322,0,0,1.064,-5.58287,50.5786)">
+				<path id="path7" class="st2" d="M163.2,477.5l271.2,271.2L759.1,557L416.4,214.2L163.2,477.5z"/>
+				<g id="g11" transform="translate(-4.22105,0.775864)">
+					<path id="path9" class="st2" d="M223.4,188.6L545.8,511l121-106.1L326,64.1l-3.2,78.4L223.4,188.6z"/>
+				</g>
+				<g id="g15" transform="translate(-85.3876,27.8512)">
+					<path id="path13" class="st2" d="M328.5,154.7l322.4,322.4l3.1-71.6L313.3,64.7l-3.6,82.2L328.5,154.7z"/>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+<g id="g23" transform="matrix(0.93750213,0,0,0.93750213,15.953517,15.99888)">
+	<path id="path21" class="st3" d="M280.6,238.7c35.1,0,65.8-14.8,85.3-30.1c19.7-15.6,48.3-12.5,64.2,6.9
+		c26.2,31.7,41.8,71.9,41.8,115.6c0,71.6-44.2,159.9-105.6,190.9c-26.4,13.3-53.8,19.6-85.6,19.6l0,0h-0.1h-0.1l0,0
+		c-31.8,0-59.2-6.3-85.6-19.6C133.5,491.1,89.3,402.7,89.3,331.2c0-43.7,15.7-83.9,41.8-115.6c15.9-19.4,44.5-22.5,64.2-6.9
+		C214.8,224,245.5,238.7,280.6,238.7L280.6,238.7z"/>
+</g>
+<g id="Flame-2" transform="matrix(0.61547875,0,0,0.56833279,-138.25728,-438.60298)" serif:id="Flame 2">
+	<path id="path25" class="st4" d="M636,823.4c-2.8-4-2.8-9.6-0.1-13.7c2.8-4.1,7.7-5.6,12.1-3.9c22.2,8.9,51.2,22.5,73.8,40.9
+		c46.9,38.3,59.7,63.9,70.2,90.3c12.4,31.2,14.2,63.5,11.6,86c-7.6,64.6-56,117.9-125,117.9c-69,0-123.9-52.8-125-117.9
+		c-0.7-39.2,12.1-70.5,26.1-92.8c3.5-5.6,10-7.8,15.8-5.6c5.8,2.3,9.5,8.6,8.8,15.3c-2,14.1-3.3,28.8-2.7,40.6
+		c2.2,39.8,25.9,50,50.2,49.8c25.9-0.2,52.1-22.2,42.7-78.4C686.3,902.9,656.8,853.5,636,823.4L636,823.4z"/>
+	<g>
+		<defs>
+			<path id="SVGID_00000170974775404888027640000005842834300324528060_" d="M636,823.4c-2.8-4-2.8-9.6-0.1-13.7
+				c2.8-4.1,7.7-5.6,12.1-3.9c22.2,8.9,51.2,22.5,73.8,40.9c46.9,38.3,59.7,63.9,70.2,90.3c12.4,31.2,14.2,63.5,11.6,86
+				c-7.6,64.6-56,117.9-125,117.9c-69,0-123.9-52.8-125-117.9c-0.7-39.2,12.1-70.5,26.1-92.8c3.5-5.6,10-7.8,15.8-5.6
+				c5.8,2.3,9.5,8.6,8.8,15.3c-2,14.1-3.3,28.8-2.7,40.6c2.2,39.8,25.9,50,50.2,49.8c25.9-0.2,52.1-22.2,42.7-78.4
+				C686.3,902.9,656.8,853.5,636,823.4L636,823.4z"/>
+		</defs>
+		<clipPath id="SVGID_00000137101924108689735560000002063526552501109413_">
+			<use xlink:href="#SVGID_00000170974775404888027640000005842834300324528060_"  style="overflow:visible;"/>
+		</clipPath>
+		<g id="g34" style="clip-path:url(#SVGID_00000137101924108689735560000002063526552501109413_);">
+			<g id="g32" transform="matrix(1.28784,-0.270602,0.285942,1.59598,247.349,825.209)">
+				<path id="path30" class="st6" d="M279.8,36.7c28.5,13.5,59.3,44.8,67.8,85.1c14.1,67-25.3,85.6-59.1,84
+					c-54.2-2.6-72.4-45.5-36.2-97.1C274.8,76.8,253.9,24.5,279.8,36.7z"/>
+			</g>
+		</g>
+	</g>
+</g>
+<path id="path958" class="st2" d="M182.4,290.6c0-4.5,3.6-8.1,8.1-8.1h15.4c7.4,0,14,4.3,17.1,10.8h139.1c8.9,0,15.4,8.5,13.1,17.1
+	l-13.9,51.5c-2.9,10.6-12.5,18-23.5,18h-97.6l1.8,9.6c0.7,3.8,4.1,6.6,8,6.6h97.6c4.5,0,8.1,3.6,8.1,8.1s-3.6,8.1-8.1,8.1H250
+	c-11.7,0-21.8-8.3-23.9-19.8L208.6,301c-0.2-1.3-1.4-2.2-2.7-2.2h-15.4C186,298.8,182.4,295.1,182.4,290.6L182.4,290.6z
+	 M225.7,439.5c0-9,7.3-16.3,16.2-16.3c9,0,16.3,7.3,16.3,16.2c0,0,0,0,0,0c0,9-7.3,16.3-16.2,16.3
+	C233,455.8,225.7,448.5,225.7,439.5C225.7,439.6,225.7,439.5,225.7,439.5z M339.4,423.3c9,0,16.2,7.3,16.3,16.2
+	c0,9-7.3,16.2-16.2,16.3c0,0,0,0,0,0c-9,0-16.2-7.3-16.3-16.2C323.2,430.6,330.4,423.3,339.4,423.3
+	C339.4,423.3,339.4,423.3,339.4,423.3z"/>
+</svg>

cookbook/static/pdfjs/LICENSE

@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS