Merge branch 'dev' of https://github.com/hay-kot/mealie into feature/authentication

frontend/src/components/Admin/General/HomePageSettings.vue

@@ -1,15 +1,15 @@
 <template>
   <v-card flat>
     <v-card-text>
-      <h2 class="mt-1 mb-1">Home Page</h2>
+      <h2 class="mt-1 mb-1">{{$t('settings.homepage.home-page')}}</h2>
       <v-row align="center" justify="center" dense class="mb-n7 pb-n5">
         <v-col cols="12" sm="3" md="2">
-          <v-switch v-model="showRecent" label="Show Recent"></v-switch>
+          <v-switch v-model="showRecent" :label="$t('settings.homepage.show-recent')"></v-switch>
         </v-col>
         <v-col cols="12" sm="5" md="5">
           <v-slider
             class="pt-sm-4"
-            label="Card Per Section"
+            :label="$t('settings.homepage.card-per-section')"
             v-model="showLimit"
             max="30"
             dense

frontend/src/locales/en.json

@@ -54,7 +54,8 @@
     "meal-plans": "Meal Plans",
     "create-a-new-meal-plan": "Create a New Meal Plan",
     "start-date": "Start Date",
-    "end-date": "End Date"
+    "end-date": "End Date",
+    "only-recipes-with-these-categories-will-be-used-in-meal-plans": "Only recipes with these categories will be used in Meal Plans"
   },
   "recipe": {
     "description": "Description",
@@ -143,6 +144,13 @@
       "backup-restore-report": "Backup Restore Report",
       "successfully-imported": "Successfully Imported",
       "failed-imports": "Failed Imports"
+    },
+    "homepage": {
+      "card-per-section": "Card Per Section",
+      "homepage-categories": "Homepage Categories",
+      "home-page": "Home Page",
+      "all-categories": "All Categories",
+      "show-recent": "Show Recent"
     }
   },
   "migration": {

frontend/src/locales/fr.json

@@ -51,7 +51,8 @@
     "meal-plans": "Plans de menu",
     "create-a-new-meal-plan": "Créer un nouveau plan de menu",
     "start-date": "Date de début",
-    "end-date": "Date de fin"
+    "end-date": "Date de fin",
+    "only-recipes-with-these-categories-will-be-used-in-meal-plans": "Seules les recettes appartenant à ces catégories seront utilisées dans le planificateur de repas."
   },
   "recipe": {
     "description": "Description",
@@ -138,6 +139,13 @@
       "backup-restore-report": "Rapport de la restauration de la sauvegarde",
       "successfully-imported": "Importé avec succès",
       "failed-imports": "Importations échouées"
+    },
+    "homepage": {
+      "all-categories": "Toutes les catégories",
+      "card-per-section": "Tuiles par section",
+      "home-page": "Page d'accueil",
+      "homepage-categories": "Catégories de la page d'accueil",
+      "show-recent": "Afficher les récentes"
     }
   },
   "migration": {
@@ -155,4 +163,4 @@
       "description": "Importer des recettes depuis Chowdown"
     }
   }
-}
+}

frontend/src/pages/Admin/MealPlanner/index.vue

@@ -19,7 +19,7 @@
             item-value="name"
             multiple
             chips
-            hint="Only recipes with these categories will be used in Meal Plans"
+            :hint="$t('meal-plan.only-recipes-with-these-categories-will-be-used-in-meal-plans')"
             class="mt-2"
             persistent-hint
           >