Merge branch 'mealie-next' into fix/make-mealie-alpha-migrations-more-fault-tolerant

mealie/lang/messages/de-DE.json

@@ -33,12 +33,12 @@
         "generic-deleted": "{name} wurde gelöscht"
     },
     "datetime": {
-        "year": "year|years",
-        "day": "day|days",
-        "hour": "hour|hours",
-        "minute": "minute|minutes",
-        "second": "second|seconds",
-        "millisecond": "millisecond|milliseconds",
-        "microsecond": "microsecond|microseconds"
+        "year": "jahr|jahre",
+        "day": "tag|tage",
+        "hour": "stunde|stunden",
+        "minute": "minute|minuten",
+        "second": "sekunde|sekunden",
+        "millisecond": "millisekunde|millisekunden",
+        "microsecond": "mikrosekunde|mikrosekunden"
     }
 }

mealie/lang/messages/es-ES.json

@@ -33,12 +33,12 @@
         "generic-deleted": "Se ha eliminado {name}"
     },
     "datetime": {
-        "year": "year|years",
-        "day": "day|days",
-        "hour": "hour|hours",
-        "minute": "minute|minutes",
-        "second": "second|seconds",
-        "millisecond": "millisecond|milliseconds",
-        "microsecond": "microsecond|microseconds"
+        "year": "año|años",
+        "day": "día|días",
+        "hour": "hora|horas",
+        "minute": "minuto|minutos",
+        "second": "segundo|segundos",
+        "millisecond": "milisegundo|milisegundos",
+        "microsecond": "microsegundo|microsegundos"
     }
 }

mealie/repos/repository_recipes.py

@@ -140,7 +140,11 @@ class RepositoryRecipes(RepositoryGeneric[Recipe, RecipeModel]):
             if isinstance(i, UUID):
                 ids.append(i)
             else:
-                slugs.append(i)
+                try:
+                    i_as_uuid = UUID(i)
+                    ids.append(i_as_uuid)
+                except ValueError:
+                    slugs.append(i)
         additional_ids = self.session.execute(select(model.id).filter(model.slug.in_(slugs))).scalars().all()
         return ids + additional_ids