Merge branch 'mealie-next' into mealie-next

.devcontainer/devcontainer.json

@@ -18,31 +18,26 @@
     "source=mealie-devcontainer-workspace,target=/workspaces/mealie/frontend/node_modules,type=volume",
     "source=mealie-bashhistory,target=/home/vscode/commandhistory,type=volume"
   ],
-  // Set *default* container specific settings.json values on container create.
+  "customizations": {
-  "settings": {
+    "vscode": {
-    "python.defaultInterpreterPath": "/usr/local/bin/python",
+      "settings": {
-    "python.linting.enabled": true,
+        "python.defaultInterpreterPath": "/usr/local/bin/python",
-    "python.linting.pylintEnabled": true,
+        "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
-    "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
+        "python.formatting.blackPath": "/usr/local/py-utils/bin/black",
-    "python.formatting.blackPath": "/usr/local/py-utils/bin/black",
+        "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
-    "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
+      },
-    "python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
+      "extensions": [
-    "python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
+        "dbaeumer.vscode-eslint",
-    "python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
+        "matangover.mypy",
-    "python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
+        "ms-python.black-formatter",
-    "python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
+        "ms-python.isort",
-    "python.linting.pylintPath": "/usr/local/py-utils/bin/pylint"
+        "ms-python.pylint",
+        "ms-python.python",
+        "ms-python.vscode-pylance",
+        "Vue.volar"
+      ]
+    }
   },
-  // Add the IDs of extensions you want installed when the container is created.
-  "extensions": [
-    "dbaeumer.vscode-eslint",
-    "matangover.mypy",
-    "ms-python.black-formatter",
-    "ms-python.isort",
-    "ms-python.python",
-    "ms-python.vscode-pylance",
-    "Vue.volar"
-  ],
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
   "forwardPorts": [
     3000,

.vscode/settings.json

@@ -36,13 +36,6 @@
   "i18n-ally.localesPaths": "frontend/lang/messages",
   "i18n-ally.sourceLanguage": "en-US",
   "python.defaultInterpreterPath": "${workspaceFolder}/.venv/bin/python",
-  "python.formatting.provider": "black",
-  "python.linting.enabled": true,
-  "python.linting.flake8Enabled": false,
-  "python.linting.pylintEnabled": false,
-  "python.linting.pylintArgs": [
-    "--rcfile=${workspaceFolder}/.pylintrc"
-  ],
   "python.testing.autoTestDiscoverOnSaveEnabled": false,
   "python.testing.pytestArgs": [
     "tests"
@@ -50,7 +43,6 @@
   "python.testing.pytestEnabled": true,
   "python.testing.unittestEnabled": false,
   "python.analysis.typeCheckingMode": "off",
-  "python.linting.mypyEnabled": true,
   "search.mode": "reuseEditor",
   "python.testing.unittestArgs": [
     "-v",
@@ -69,4 +61,7 @@
   "[vue]": {
     "editor.formatOnSave": false
   },
+  "[python]": {
+    "editor.defaultFormatter": "ms-python.black-formatter",
+  },
 }

frontend/lang/messages/es-ES.json

@@ -655,14 +655,14 @@
       "you-have-token-count": "Usted no tiene tokens activos.|Usted tiene un token activo.|Usted tiene {count} tokens activos."
     },
     "toolbox": {
-      "assign-all": "Asignar todos los",
+      "assign-all": "Asignar todos",
       "bulk-assign": "Asignar en masa",
-      "new-name": "Nombre Nuevo",
+      "new-name": "Nuevo Nombre",
       "no-unused-items": "No hay elementos sin usar",
-      "recipes-affected": "Ninguna receta afectada | Una receta afectada |{count} recetas afectadas",
+      "recipes-affected": "Ninguna receta afectada|Una receta afectada|{count} recetas afectadas",
-      "remove-unused": "Eliminar los no usados",
+      "remove-unused": "Eliminar los no utilizados",
       "title-case-all": "Primera letra en mayúscula",
-      "toolbox": "Herramientas",
+      "toolbox": "Utensilios",
       "unorganized": "Sin organizar"
     },
     "webhooks": {
@@ -746,7 +746,7 @@
     "search": "Buscar",
     "site-settings": "Ajustes",
     "tags": "Etiquetas",
-    "toolbox": "Herramientas",
+    "toolbox": "Utensilios",
     "language": "Idioma",
     "maintenance": "Mantenimiento",
     "background-tasks": "Tareas en Segundo Plano",
@@ -784,7 +784,7 @@
     "tool-name": "Nombre del utensilio",
     "create-new-tool": "Crear nuevo utensilio",
     "on-hand-checkbox-label": "Mostrar como disponible (marcado)",
-    "required-tools": "Herramientas necesarias"
+    "required-tools": "Utensilios necesarios"
   },
   "user": {
     "admin": "Administrador/a",
@@ -967,9 +967,9 @@
       "tag-data": "Etiquetar Datos"
     },
     "tools": {
-      "new-tool": "Nueva Herramienta",
+      "new-tool": "Nuevo Utensilio",
-      "edit-tool": "Editar Herramienta",
+      "edit-tool": "Editar Utensilio",
-      "tool-data": "Datos Herramienta"
+      "tool-data": "Datos Utensilio"
     }
   },
   "user-registration": {
@@ -1151,7 +1151,7 @@
     "filter-options-description": "Cuando \"Requerir todo\" esté seleccionado, el recetario solo incluirá recetas que tengan todos los elementos seleccionados. Esto se aplica a cada subconjunto de selectores y no a una sección de los elementos seleccionados.",
     "require-all-categories": "Requerir todas las categorías",
     "require-all-tags": "Requerir todas las etiquetas",
-    "require-all-tools": "Requiere todas las herramientas",
+    "require-all-tools": "Requiere todos los utensilios",
     "cookbook-name": "Nombre del recetario",
     "cookbook-with-name": "Recetario {0}"
   }

frontend/lang/messages/fr-CA.json

@@ -463,9 +463,9 @@
     "add-to-plan": "Ajouter à la planification des repas",
     "add-to-timeline": "Ajouter à l’historique",
     "recipe-added-to-list": "Recette ajoutée à la liste",
-    "recipes-added-to-list": "Recipes added to list",
+    "recipes-added-to-list": "Recettes ajoutées à la liste",
     "recipe-added-to-mealplan": "Recette ajoutée à la planification des repas",
-    "failed-to-add-recipes-to-list": "Failed to add recipe to list",
+    "failed-to-add-recipes-to-list": "Impossible d’ajouter la recette à la liste",
     "failed-to-add-recipe-to-mealplan": "Échec de l'ajout de la recette à la planification des repas",
     "yield": "Rendement",
     "quantity": "Quantité",
@@ -957,19 +957,19 @@
     "columns": "Colonnes",
     "combine": "Combiner",
     "categories": {
-      "edit-category": "Edit Category",
+      "edit-category": "Modifier la catégorie",
-      "new-category": "New Category",
+      "new-category": "Nouvelle catégorie",
-      "category-data": "Category Data"
+      "category-data": "Données de catégorie"
     },
     "tags": {
-      "new-tag": "New Tag",
+      "new-tag": "Nouvelle étiquette",
-      "edit-tag": "Edit Tag",
+      "edit-tag": "Modifier l'étiquette",
-      "tag-data": "Tag Data"
+      "tag-data": "Données de l'étiquette"
     },
     "tools": {
-      "new-tool": "New Tool",
+      "new-tool": "Nouvel outil",
-      "edit-tool": "Edit Tool",
+      "edit-tool": "Modifier l'outil",
-      "tool-data": "Tool Data"
+      "tool-data": "Données de l'outil"
     }
   },
   "user-registration": {

frontend/lang/messages/fr-FR.json

@@ -463,9 +463,9 @@
     "add-to-plan": "Ajouter au menu",
     "add-to-timeline": "Ajouter à l’historique",
     "recipe-added-to-list": "Recette ajoutée à la liste",
-    "recipes-added-to-list": "Recipes added to list",
+    "recipes-added-to-list": "Recettes ajoutées à la liste",
     "recipe-added-to-mealplan": "Recette ajoutée au menu",
-    "failed-to-add-recipes-to-list": "Failed to add recipe to list",
+    "failed-to-add-recipes-to-list": "Impossible d’ajouter la recette à la liste",
     "failed-to-add-recipe-to-mealplan": "Échec de l’ajout de la recette au menu",
     "yield": "Nombre de portions",
     "quantity": "Quantité",