Merge branch 'mealie-next' into chore-bump-nuxt-to-2.17.3

.devcontainer/devcontainer.json

@@ -49,7 +49,9 @@
   "onCreateCommand": "sudo chown -R vscode:vscode /workspaces/mealie/frontend/node_modules && task setup",
   // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
   "remoteUser": "vscode",
-  // "features": {
-  //   "git": "latest"
-  // }
+  "features": {
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {
+      "dockerDashComposeVersion": "v2"
+    }
+  }
 }

.github/workflows/release.yml

@@ -49,6 +49,8 @@ jobs:
     needs:
       - build-release
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
       - name: Checkout 🛎
         uses: actions/checkout@v4

frontend/lang/messages/ru-RU.json

@@ -707,7 +707,7 @@
     "email-configured": "Email настроен",
     "email-test-results": "Результаты теста Email",
     "ready": "Готово",
-    "not-ready": "Не готово - Проверьте переменные окружающей среды",
+    "not-ready": "Не готово - Проверьте переменные окружения",
     "succeeded": "Выполнено успешно",
     "failed": "Ошибка",
     "general-about": "Общая информация",

frontend/pages/admin/manage/users/_id.vue

@@ -31,7 +31,18 @@
             <BaseButton type="button" :loading="generatingToken" create @click.prevent="handlePasswordReset">
               {{ $t("user.generate-password-reset-link") }}
             </BaseButton>
-            <AppButtonCopy v-if="resetUrl" :copy-text="resetUrl"></AppButtonCopy>
+          </div>
+          <div v-if="resetUrl" class="mb-2">
+            <v-card-text>
+              <p class="text-center pb-0">
+                {{ resetUrl }}
+              </p>
+            </v-card-text>
+            <v-card-actions class="align-center" style="gap: 4px">
+              <BaseButton cancel @click="resetUrl = ''"> {{ $t("general.close") }} </BaseButton>
+              <v-spacer></v-spacer>
+              <AppButtonCopy :icon="false" color="info" :copy-text="resetUrl" />
+            </v-card-actions>
           </div>
 
           <AutoForm v-model="user" :items="userForm" update-mode :disabled-fields="disabledFields" />

mealie/lang/messages/fr-FR.json

@@ -33,12 +33,12 @@
         "generic-deleted": "{name} a été supprimé"
     },
     "datetime": {
-        "year": "year|years",
-        "day": "day|days",
-        "hour": "hour|hours",
+        "year": "année|années",
+        "day": "jour|jours",
+        "hour": "heure|heures",
         "minute": "minute|minutes",
-        "second": "second|seconds",
-        "millisecond": "millisecond|milliseconds",
-        "microsecond": "microsecond|microseconds"
+        "second": "seconde|secondes",
+        "millisecond": "milliseconde|millisecondes",
+        "microsecond": "microseconde|microsecondes"
     }
 }

mealie/lang/messages/sv-SE.json

@@ -33,11 +33,11 @@
         "generic-deleted": "{name} har tagits bort"
     },
     "datetime": {
-        "year": "year|years",
-        "day": "day|days",
-        "hour": "hour|hours",
-        "minute": "minute|minutes",
-        "second": "second|seconds",
+        "year": "år|år",
+        "day": "dag|dagar",
+        "hour": "timme|timmar",
+        "minute": "minut|minuter",
+        "second": "sekund|sekunder",
         "millisecond": "millisecond|milliseconds",
         "microsecond": "microsecond|microseconds"
     }

mealie/lang/messages/tr-TR.json

@@ -33,12 +33,12 @@
         "generic-deleted": "{name} silindi"
     },
     "datetime": {
-        "year": "year|years",
-        "day": "day|days",
-        "hour": "hour|hours",
-        "minute": "minute|minutes",
-        "second": "second|seconds",
-        "millisecond": "millisecond|milliseconds",
-        "microsecond": "microsecond|microseconds"
+        "year": "yıl|yıllar",
+        "day": "gün|günler",
+        "hour": "saat|saatler",
+        "minute": "dakika|dakikalar",
+        "second": "saniye|saniyeler",
+        "millisecond": "milisaniye|milisaniyeler",
+        "microsecond": "mikrosaniye|mikrosaniyeler"
     }
 }

mealie/lang/messages/uk-UA.json

@@ -33,12 +33,12 @@
         "generic-deleted": "{name} видалено"
     },
     "datetime": {
-        "year": "year|years",
-        "day": "day|days",
-        "hour": "hour|hours",
-        "minute": "minute|minutes",
-        "second": "second|seconds",
-        "millisecond": "millisecond|milliseconds",
-        "microsecond": "microsecond|microseconds"
+        "year": "рік|роки",
+        "day": "день|дні",
+        "hour": "година|години",
+        "minute": "хвилина|хвилини",
+        "second": "секунда|секунди",
+        "millisecond": "мілісекунда|мілісекунди",
+        "microsecond": "мікросекунда|мікросекунди"
     }
 }

poetry.lock

@@ -1220,13 +1220,13 @@ min-versions = ["babel (==2.9.0)", "click (==7.0)", "colorama (==0.4)", "ghp-imp
 
 [[package]]
 name = "mkdocs-material"
-version = "9.5.8"
+version = "9.5.9"
 description = "Documentation that simply works"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "mkdocs_material-9.5.8-py3-none-any.whl", hash = "sha256:14563314bbf97da4bfafc69053772341babfaeb3329cde01d3e63cec03997af8"},
-    {file = "mkdocs_material-9.5.8.tar.gz", hash = "sha256:2a429213e83f84eda7a588e2b186316d806aac602b7f93990042f7a1f3d3cf65"},
+    {file = "mkdocs_material-9.5.9-py3-none-any.whl", hash = "sha256:a5d62b73b3b74349e45472bfadc129c871dd2d4add68d84819580597b2f50d5d"},
+    {file = "mkdocs_material-9.5.9.tar.gz", hash = "sha256:635df543c01c25c412d6c22991872267723737d5a2f062490f33b2da1c013c6d"},
 ]
 
 [package.dependencies]
@@ -1965,13 +1965,13 @@ pyasn1_modules = ">=0.1.5"
 
 [[package]]
 name = "python-multipart"
-version = "0.0.7"
+version = "0.0.8"
 description = "A streaming multipart parser for Python"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "python_multipart-0.0.7-py3-none-any.whl", hash = "sha256:b1fef9a53b74c795e2347daac8c54b252d9e0df9c619712691c1cc8021bd3c49"},
-    {file = "python_multipart-0.0.7.tar.gz", hash = "sha256:288a6c39b06596c1b988bb6794c6fbc80e6c369e35e5062637df256bee0c9af9"},
+    {file = "python_multipart-0.0.8-py3-none-any.whl", hash = "sha256:999725bf08cf7a071073d157a27cc34f8669af98da0d2435bde1cc1493a50ec3"},
+    {file = "python_multipart-0.0.8.tar.gz", hash = "sha256:613015c642c2f6dc6d22e2d3a4d993683bb4752509ccd87f831dced121ed2f1d"},
 ]
 
 [package.extras]
@@ -2944,4 +2944,4 @@ pgsql = ["psycopg2-binary"]
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "f1a8d11fafed5d812ea0e54fc01aa5761f47bffb14caaeba7216862377fbeb54"
+content-hash = "1736aa5636b88092eb4e998a1a783ea13fdf1e4987b524d3570dfbc7f6e6f35a"

pyproject.toml

@@ -33,7 +33,7 @@ python-dateutil = "^2.8.2"
 python-dotenv = "^1.0.0"
 python-jose = "^3.3.0"
 python-ldap = "^3.3.1"
-python-multipart = "^0.0.7"
+python-multipart = "^0.0.8"
 python-slugify = "^8.0.0"
 recipe-scrapers = "^14.53.0"
 requests = "^2.31.0"