Merge branch 'mealie-next' into reset-scroll-position

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
     name: Build Package
     uses: ./.github/workflows/build-package.yml
     with:
-      tag: ${{ github.event.release.tag_name }}
+      tag: release
 
   publish:
     permissions:

frontend/components/Domain/Recipe/RecipeCardSection.vue

@@ -123,6 +123,7 @@
               :image="recipe.image!"
               :tags="recipe.tags!"
               :recipe-id="recipe.id!"
+              @click="handleRecipeNavigation"
             />
           </v-col>
         </v-row>
@@ -147,6 +148,7 @@
               :image="recipe.image!"
               :tags="recipe.tags!"
               :recipe-id="recipe.id!"
+              @selected="handleRecipeNavigation"
             />
           </v-col>
         </v-row>
@@ -171,6 +173,7 @@ import { useLazyRecipes } from "~/composables/recipes";
 import type { Recipe } from "~/lib/api/types/recipe";
 import { useUserSortPreferences } from "~/composables/use-users/preferences";
 import type { RecipeSearchQuery } from "~/lib/api/user/recipes/recipe";
+import { useRecipeListState } from "~/composables/recipe-page/use-recipe-list-state";
 
 const REPLACE_RECIPES_EVENT = "replaceRecipes";
 const APPEND_RECIPES_EVENT = "appendRecipes";
@@ -241,9 +244,11 @@ export default defineNuxtComponent({
     const route = useRoute();
     const groupSlug = computed(() => route.params.groupSlug as string || $auth.user.value?.groupSlug || "");
 
-    const page = ref(1);
+    const recipeListState = useRecipeListState(props.query);
+
+    const page = ref(recipeListState.state.page || 1);
     const perPage = 32;
-    const hasMore = ref(true);
+    const hasMore = ref(recipeListState.state.hasMore);
     const ready = ref(false);
     const loading = ref(false);
 
@@ -282,8 +287,33 @@ export default defineNuxtComponent({
       );
     }
 
+    // Save scroll position
+    const throttledScrollSave = useThrottleFn(() => {
+      recipeListState.saveScrollPosition();
+    }, 1000);
+
     onMounted(async () => {
-      await initRecipes();
+      window.addEventListener("scroll", throttledScrollSave);
+
+      // cached state with scroll position
+      if (recipeListState.hasValidState() && recipeListState.isQueryMatch(props.query)) {
+        // Restore from cached state
+        page.value = recipeListState.state.page;
+        hasMore.value = recipeListState.state.hasMore;
+        ready.value = recipeListState.state.ready;
+
+        // Emit cached recipes
+        context.emit(REPLACE_RECIPES_EVENT, recipeListState.state.recipes);
+
+        // Restore scroll position after recipes are rendered
+        nextTick(() => {
+          recipeListState.restoreScrollPosition();
+        });
+      }
+      else {
+        // Initialize fresh recipes
+        await initRecipes();
+      }
       ready.value = true;
     });
 
@@ -294,6 +324,10 @@ export default defineNuxtComponent({
         const newValueString = JSON.stringify(newValue);
         if (lastQuery !== newValueString) {
           lastQuery = newValueString;
+
+          // Save scroll position before query change
+          recipeListState.saveScrollPosition();
+
           ready.value = false;
           await initRecipes();
           ready.value = true;
@@ -315,6 +349,14 @@ export default defineNuxtComponent({
       // since we doubled the first call, we also need to advance the page
       page.value = page.value + 1;
 
+      // Save state after fetching recipes
+      recipeListState.saveState({
+        recipes: newRecipes,
+        page: page.value,
+        hasMore: hasMore.value,
+        ready: true,
+      });
+
       context.emit(REPLACE_RECIPES_EVENT, newRecipes);
     }
 
@@ -331,6 +373,14 @@ export default defineNuxtComponent({
         hasMore.value = false;
       }
       if (newRecipes.length) {
+        // Update cached state with new recipes
+        const allRecipes = [...(recipeListState.state.recipes || []), ...newRecipes] as Recipe[];
+        recipeListState.saveState({
+          recipes: allRecipes,
+          page: page.value,
+          hasMore: hasMore.value,
+        });
+
         context.emit(APPEND_RECIPES_EVENT, newRecipes);
       }
 
@@ -408,6 +458,15 @@ export default defineNuxtComponent({
 
       // fetch new recipes
       const newRecipes = await fetchRecipes();
+
+      // Update cached state
+      recipeListState.saveState({
+        recipes: newRecipes,
+        page: page.value,
+        hasMore: hasMore.value,
+        ready: true,
+      });
+
       context.emit(REPLACE_RECIPES_EVENT, newRecipes);
 
       state.sortLoading = false;
@@ -427,6 +486,17 @@ export default defineNuxtComponent({
       preferences.value.useMobileCards = !preferences.value.useMobileCards;
     }
 
+    // Save scroll position when component is unmounted or when navigating away
+    onBeforeUnmount(() => {
+      recipeListState.saveScrollPosition();
+      window.removeEventListener("scroll", throttledScrollSave);
+    });
+
+    // Save scroll position when navigating to recipe pages
+    function handleRecipeNavigation() {
+      recipeListState.saveScrollPosition();
+    }
+
     return {
       ...toRefs(state),
       displayTitleIcon,
@@ -439,6 +509,7 @@ export default defineNuxtComponent({
       sortRecipes,
       toggleMobileCards,
       useMobileCards,
+      handleRecipeNavigation,
     };
   },
 });

frontend/components/global/CrudTable.vue

@@ -42,7 +42,7 @@
         color="info"
         variant="elevated"
         :items="bulkActions"
-        v-on="bulkActionListener"
+        v-bind="bulkActionListener"
       />
       <slot name="button-row" />
     </v-card-actions>
@@ -55,7 +55,7 @@
     </div>
     <v-data-table
       v-model="selected"
-      return-object
+      item-key="id"
       :headers="activeHeaders"
       :show-select="bulkActions.length > 0"
       :sort-by="sortBy"

frontend/composables/recipe-page/use-recipe-list-state.ts

@@ -0,0 +1,94 @@
+import type { Recipe } from "~/lib/api/types/recipe";
+import type { RecipeSearchQuery } from "~/lib/api/user/recipes/recipe";
+
+interface RecipeListState {
+  recipes: Recipe[];
+  page: number;
+  hasMore: boolean;
+  scrollPosition: number;
+  query: RecipeSearchQuery | null;
+  ready: boolean;
+}
+
+const recipeListStates = new Map<string, RecipeListState>();
+
+function generateStateKey(query: RecipeSearchQuery | null): string {
+  if (!query) return "default";
+
+  const keyParts = [
+    query.search || "",
+    query.orderBy || "",
+    query.orderDirection || "",
+    query.queryFilter || "",
+    JSON.stringify(query.categories || []),
+    JSON.stringify(query.tags || []),
+    JSON.stringify(query.tools || []),
+    JSON.stringify(query.foods || []),
+    JSON.stringify(query.households || []),
+  ];
+
+  return keyParts.join("|");
+}
+
+export function useRecipeListState(query: RecipeSearchQuery | null) {
+  const stateKey = generateStateKey(query);
+
+  // Initialize state if it doesn't exist
+  if (!recipeListStates.has(stateKey)) {
+    recipeListStates.set(stateKey, {
+      recipes: [],
+      page: 1,
+      hasMore: true,
+      scrollPosition: 0,
+      query,
+      ready: false,
+    });
+  }
+
+  const state = recipeListStates.get(stateKey)!;
+
+  function saveState(newState: Partial<RecipeListState>) {
+    Object.assign(state, newState);
+  }
+
+  function saveScrollPosition() {
+    state.scrollPosition = window.scrollY || document.documentElement.scrollTop || 0;
+  }
+
+  function restoreScrollPosition() {
+    if (state.scrollPosition > 0) {
+      // Use nextTick to ensure DOM is updated before scrolling
+      nextTick(() => {
+        window.scrollTo(0, state.scrollPosition);
+      });
+    }
+  }
+
+  function clearState() {
+    recipeListStates.delete(stateKey);
+  }
+
+  function hasValidState(): boolean {
+    return state.recipes.length > 0 && state.ready;
+  }
+
+  function isQueryMatch(newQuery: RecipeSearchQuery | null): boolean {
+    const newKey = generateStateKey(newQuery);
+    return newKey === stateKey;
+  }
+
+  return {
+    state: readonly(state),
+    saveState,
+    saveScrollPosition,
+    restoreScrollPosition,
+    clearState,
+    hasValidState,
+    isQueryMatch,
+  };
+}
+
+// Clean up old states when navigating away from recipe sections
+export function cleanupRecipeListStates() {
+  recipeListStates.clear();
+}

frontend/composables/use-groups.ts

@@ -45,11 +45,28 @@ export const useGroupSelf = function () {
 export const useGroups = function () {
   const api = useUserApi();
   const loading = ref(false);
-  const groups = ref<GroupSummary[] | null>(null);
 
-  async function getAllGroups() {
+  function getAllGroups() {
     loading.value = true;
-    const { data } = await api.groups.getAll(1, -1, { orderBy: "name", orderDirection: "asc" });
+    const asyncKey = String(Date.now());
+    const { data: groups } = useAsyncData(asyncKey, async () => {
+      const { data } = await api.groups.getAll(1, -1, { orderBy: "name", orderDirection: "asc" }); ;
+
+      if (data) {
+        return data.items;
+      }
+      else {
+        return null;
+      }
+    });
+
+    loading.value = false;
+    return groups;
+  }
+
+  async function refreshAllGroups() {
+    loading.value = true;
+    const { data } = await api.groups.getAll(1, -1, { orderBy: "name", orderDirection: "asc" }); ;
 
     if (data) {
       groups.value = data.items;
@@ -61,15 +78,11 @@ export const useGroups = function () {
     loading.value = false;
   }
 
-  async function refreshAllGroups() {
-    await getAllGroups();
-  }
-
   async function deleteGroup(id: string | number) {
     loading.value = true;
     const { data } = await api.groups.deleteOne(id);
     loading.value = false;
-    await refreshAllGroups();
+    refreshAllGroups();
     return data;
   }
 
@@ -80,13 +93,9 @@ export const useGroups = function () {
     if (data && groups.value) {
       groups.value.push(data);
     }
-    loading.value = false;
   }
 
-  // Initialize data on first call
+  const groups = getAllGroups();
-  if (!groups.value) {
-    getAllGroups();
-  }
 
   return { groups, getAllGroups, refreshAllGroups, deleteGroup, createGroup };
 };

frontend/composables/use-households.ts

@@ -48,11 +48,28 @@ export const useHouseholdSelf = function () {
 export const useAdminHouseholds = function () {
   const api = useAdminApi();
   const loading = ref(false);
-  const households = ref<HouseholdInDB[] | null>(null);
 
-  async function getAllHouseholds() {
+  function getAllHouseholds() {
     loading.value = true;
-    const { data } = await api.households.getAll(1, -1, { orderBy: "name, group.name", orderDirection: "asc" });
+    const asyncKey = String(Date.now());
+    const { data: households } = useAsyncData(asyncKey, async () => {
+      const { data } = await api.households.getAll(1, -1, { orderBy: "name, group.name", orderDirection: "asc" });
+
+      if (data) {
+        return data.items;
+      }
+      else {
+        return null;
+      }
+    });
+
+    loading.value = false;
+    return households;
+  }
+
+  async function refreshAllHouseholds() {
+    loading.value = true;
+    const { data } = await api.households.getAll(1, -1, { orderBy: "name, group.name", orderDirection: "asc" }); ;
 
     if (data) {
       households.value = data.items;
@@ -64,15 +81,11 @@ export const useAdminHouseholds = function () {
     loading.value = false;
   }
 
-  async function refreshAllHouseholds() {
-    await getAllHouseholds();
-  }
-
   async function deleteHousehold(id: string | number) {
     loading.value = true;
     const { data } = await api.households.deleteOne(id);
     loading.value = false;
-    await refreshAllHouseholds();
+    refreshAllHouseholds();
     return data;
   }
 
@@ -83,9 +96,9 @@ export const useAdminHouseholds = function () {
     if (data && households.value) {
       households.value.push(data);
     }
-    loading.value = false;
   }
 
+  const households = getAllHouseholds();
   function useHouseholdsInGroup(groupIdRef: Ref<string>) {
     return computed(
       () => {
@@ -96,10 +109,6 @@ export const useAdminHouseholds = function () {
     );
   }
 
-  if (!households.value) {
-    getAllHouseholds();
-  }
-
   return {
     households,
     useHouseholdsInGroup,

frontend/composables/use-locales/available-locales.ts

@@ -93,7 +93,7 @@ export const LOCALES = [
   {
     name: "Nederlands (Dutch)",
     value: "nl-NL",
-    progress: 42,
+    progress: 39,
     dir: "ltr",
   },
   {
@@ -135,7 +135,7 @@ export const LOCALES = [
   {
     name: "Magyar (Hungarian)",
     value: "hu-HU",
-    progress: 39,
+    progress: 38,
     dir: "ltr",
   },
   {
@@ -213,7 +213,7 @@ export const LOCALES = [
   {
     name: "Deutsch (German)",
     value: "de-DE",
-    progress: 55,
+    progress: 46,
     dir: "ltr",
   },
   {

frontend/i18n.config.ts

@@ -1,47 +1,47 @@
 /* eslint-disable @typescript-eslint/no-require-imports */
 const datetimeFormats = {
   // CODE_GEN_ID: DATE_LOCALES
-  "tr-TR": require("./lang/dateTimeFormats/tr-TR.json"),
-  "zh-CN": require("./lang/dateTimeFormats/zh-CN.json"),
-  "ja-JP": require("./lang/dateTimeFormats/ja-JP.json"),
-  "en-GB": require("./lang/dateTimeFormats/en-GB.json"),
-  "ca-ES": require("./lang/dateTimeFormats/ca-ES.json"),
-  "it-IT": require("./lang/dateTimeFormats/it-IT.json"),
-  "pl-PL": require("./lang/dateTimeFormats/pl-PL.json"),
-  "pt-PT": require("./lang/dateTimeFormats/pt-PT.json"),
-  "ro-RO": require("./lang/dateTimeFormats/ro-RO.json"),
-  "sr-SP": require("./lang/dateTimeFormats/sr-SP.json"),
-  "hr-HR": require("./lang/dateTimeFormats/hr-HR.json"),
-  "de-DE": require("./lang/dateTimeFormats/de-DE.json"),
-  "zh-TW": require("./lang/dateTimeFormats/zh-TW.json"),
-  "af-ZA": require("./lang/dateTimeFormats/af-ZA.json"),
-  "fr-CA": require("./lang/dateTimeFormats/fr-CA.json"),
-  "he-IL": require("./lang/dateTimeFormats/he-IL.json"),
-  "pt-BR": require("./lang/dateTimeFormats/pt-BR.json"),
-  "cs-CZ": require("./lang/dateTimeFormats/cs-CZ.json"),
-  "fr-FR": require("./lang/dateTimeFormats/fr-FR.json"),
-  "ru-RU": require("./lang/dateTimeFormats/ru-RU.json"),
-  "is-IS": require("./lang/dateTimeFormats/is-IS.json"),
-  "sk-SK": require("./lang/dateTimeFormats/sk-SK.json"),
-  "el-GR": require("./lang/dateTimeFormats/el-GR.json"),
-  "fr-BE": require("./lang/dateTimeFormats/fr-BE.json"),
-  "da-DK": require("./lang/dateTimeFormats/da-DK.json"),
   "hu-HU": require("./lang/dateTimeFormats/hu-HU.json"),
-  "es-ES": require("./lang/dateTimeFormats/es-ES.json"),
-  "gl-ES": require("./lang/dateTimeFormats/gl-ES.json"),
   "no-NO": require("./lang/dateTimeFormats/no-NO.json"),
-  "lt-LT": require("./lang/dateTimeFormats/lt-LT.json"),
+  "nl-NL": require("./lang/dateTimeFormats/nl-NL.json"),
+  "pl-PL": require("./lang/dateTimeFormats/pl-PL.json"),
+  "da-DK": require("./lang/dateTimeFormats/da-DK.json"),
+  "fr-CA": require("./lang/dateTimeFormats/fr-CA.json"),
+  "fr-BE": require("./lang/dateTimeFormats/fr-BE.json"),
+  "it-IT": require("./lang/dateTimeFormats/it-IT.json"),
+  "sl-SI": require("./lang/dateTimeFormats/sl-SI.json"),
+  "sr-SP": require("./lang/dateTimeFormats/sr-SP.json"),
+  "is-IS": require("./lang/dateTimeFormats/is-IS.json"),
+  "ja-JP": require("./lang/dateTimeFormats/ja-JP.json"),
+  "fr-FR": require("./lang/dateTimeFormats/fr-FR.json"),
+  "ca-ES": require("./lang/dateTimeFormats/ca-ES.json"),
+  "tr-TR": require("./lang/dateTimeFormats/tr-TR.json"),
+  "fi-FI": require("./lang/dateTimeFormats/fi-FI.json"),
+  "hr-HR": require("./lang/dateTimeFormats/hr-HR.json"),
+  "pt-BR": require("./lang/dateTimeFormats/pt-BR.json"),
+  "sk-SK": require("./lang/dateTimeFormats/sk-SK.json"),
+  "zh-CN": require("./lang/dateTimeFormats/zh-CN.json"),
+  "pt-PT": require("./lang/dateTimeFormats/pt-PT.json"),
+  "en-GB": require("./lang/dateTimeFormats/en-GB.json"),
+  "ro-RO": require("./lang/dateTimeFormats/ro-RO.json"),
+  "cs-CZ": require("./lang/dateTimeFormats/cs-CZ.json"),
   "en-US": require("./lang/dateTimeFormats/en-US.json"),
-  "sv-SE": require("./lang/dateTimeFormats/sv-SE.json"),
+  "lv-LV": require("./lang/dateTimeFormats/lv-LV.json"),
   "ko-KR": require("./lang/dateTimeFormats/ko-KR.json"),
   "bg-BG": require("./lang/dateTimeFormats/bg-BG.json"),
-  "sl-SI": require("./lang/dateTimeFormats/sl-SI.json"),
+  "gl-ES": require("./lang/dateTimeFormats/gl-ES.json"),
-  "uk-UA": require("./lang/dateTimeFormats/uk-UA.json"),
+  "de-DE": require("./lang/dateTimeFormats/de-DE.json"),
-  "lv-LV": require("./lang/dateTimeFormats/lv-LV.json"),
+  "lt-LT": require("./lang/dateTimeFormats/lt-LT.json"),
+  "ru-RU": require("./lang/dateTimeFormats/ru-RU.json"),
+  "he-IL": require("./lang/dateTimeFormats/he-IL.json"),
+  "el-GR": require("./lang/dateTimeFormats/el-GR.json"),
+  "zh-TW": require("./lang/dateTimeFormats/zh-TW.json"),
+  "af-ZA": require("./lang/dateTimeFormats/af-ZA.json"),
+  "es-ES": require("./lang/dateTimeFormats/es-ES.json"),
+  "sv-SE": require("./lang/dateTimeFormats/sv-SE.json"),
   "ar-SA": require("./lang/dateTimeFormats/ar-SA.json"),
-  "nl-NL": require("./lang/dateTimeFormats/nl-NL.json"),
   "vi-VN": require("./lang/dateTimeFormats/vi-VN.json"),
-  "fi-FI": require("./lang/dateTimeFormats/fi-FI.json"),
+  "uk-UA": require("./lang/dateTimeFormats/uk-UA.json"),
   // END: DATE_LOCALES
 };
 

frontend/lang/messages/fr-FR.json

@@ -599,7 +599,7 @@
     "create-recipe-from-an-image": "Créer une recette à partir d’une image",
     "create-recipe-from-an-image-description": "Créez une recette en téléchargeant une image de celle-ci. Mealie utilisera l’IA pour tenter d’extraire le texte et de créer une recette.",
     "crop-and-rotate-the-image": "Rogner et pivoter l’image pour que seul le texte soit visible, et qu’il soit dans la bonne orientation.",
-    "create-from-images": "Créer à partir d’images",
+    "create-from-images": "Create from Images",
     "should-translate-description": "Traduire la recette dans ma langue",
     "please-wait-image-procesing": "Veuillez patienter, l’image est en cours de traitement. Cela peut prendre du temps.",
     "please-wait-images-processing": "Please wait, the images are processing. This may take some time.",

frontend/nuxt.config.ts

@@ -241,48 +241,48 @@ export default defineNuxtConfig({
   i18n: {
     locales: [
       // CODE_GEN_ID: MESSAGE_LOCALES
-      { code: "tr-TR", file: "tr-TR.ts" },
-      { code: "zh-CN", file: "zh-CN.ts" },
-      { code: "ja-JP", file: "ja-JP.ts" },
-      { code: "en-GB", file: "en-GB.ts" },
-      { code: "ca-ES", file: "ca-ES.ts" },
-      { code: "it-IT", file: "it-IT.ts" },
-      { code: "pl-PL", file: "pl-PL.ts" },
-      { code: "pt-PT", file: "pt-PT.ts" },
-      { code: "ro-RO", file: "ro-RO.ts" },
-      { code: "sr-SP", file: "sr-SP.ts" },
-      { code: "hr-HR", file: "hr-HR.ts" },
-      { code: "de-DE", file: "de-DE.ts" },
-      { code: "zh-TW", file: "zh-TW.ts" },
-      { code: "af-ZA", file: "af-ZA.ts" },
-      { code: "fr-CA", file: "fr-CA.ts" },
-      { code: "he-IL", file: "he-IL.ts" },
-      { code: "pt-BR", file: "pt-BR.ts" },
-      { code: "cs-CZ", file: "cs-CZ.ts" },
-      { code: "fr-FR", file: "fr-FR.ts" },
-      { code: "ru-RU", file: "ru-RU.ts" },
-      { code: "is-IS", file: "is-IS.ts" },
-      { code: "sk-SK", file: "sk-SK.ts" },
-      { code: "el-GR", file: "el-GR.ts" },
-      { code: "fr-BE", file: "fr-BE.ts" },
-      { code: "da-DK", file: "da-DK.ts" },
       { code: "hu-HU", file: "hu-HU.ts" },
-      { code: "es-ES", file: "es-ES.ts" },
-      { code: "gl-ES", file: "gl-ES.ts" },
       { code: "no-NO", file: "no-NO.ts" },
-      { code: "lt-LT", file: "lt-LT.ts" },
+      { code: "nl-NL", file: "nl-NL.ts" },
+      { code: "pl-PL", file: "pl-PL.ts" },
+      { code: "da-DK", file: "da-DK.ts" },
+      { code: "fr-CA", file: "fr-CA.ts" },
+      { code: "fr-BE", file: "fr-BE.ts" },
+      { code: "it-IT", file: "it-IT.ts" },
+      { code: "sl-SI", file: "sl-SI.ts" },
+      { code: "sr-SP", file: "sr-SP.ts" },
+      { code: "is-IS", file: "is-IS.ts" },
+      { code: "ja-JP", file: "ja-JP.ts" },
+      { code: "fr-FR", file: "fr-FR.ts" },
+      { code: "ca-ES", file: "ca-ES.ts" },
+      { code: "tr-TR", file: "tr-TR.ts" },
+      { code: "fi-FI", file: "fi-FI.ts" },
+      { code: "hr-HR", file: "hr-HR.ts" },
+      { code: "pt-BR", file: "pt-BR.ts" },
+      { code: "sk-SK", file: "sk-SK.ts" },
+      { code: "zh-CN", file: "zh-CN.ts" },
+      { code: "pt-PT", file: "pt-PT.ts" },
+      { code: "en-GB", file: "en-GB.ts" },
+      { code: "ro-RO", file: "ro-RO.ts" },
+      { code: "cs-CZ", file: "cs-CZ.ts" },
+      { code: "et-EE", file: "et-EE.ts" },
       { code: "en-US", file: "en-US.ts" },
-      { code: "sv-SE", file: "sv-SE.ts" },
+      { code: "lv-LV", file: "lv-LV.ts" },
       { code: "ko-KR", file: "ko-KR.ts" },
       { code: "bg-BG", file: "bg-BG.ts" },
-      { code: "sl-SI", file: "sl-SI.ts" },
+      { code: "gl-ES", file: "gl-ES.ts" },
-      { code: "uk-UA", file: "uk-UA.ts" },
+      { code: "de-DE", file: "de-DE.ts" },
-      { code: "et-EE", file: "et-EE.ts" },
+      { code: "lt-LT", file: "lt-LT.ts" },
-      { code: "lv-LV", file: "lv-LV.ts" },
+      { code: "ru-RU", file: "ru-RU.ts" },
+      { code: "he-IL", file: "he-IL.ts" },
+      { code: "el-GR", file: "el-GR.ts" },
+      { code: "zh-TW", file: "zh-TW.ts" },
+      { code: "af-ZA", file: "af-ZA.ts" },
+      { code: "es-ES", file: "es-ES.ts" },
+      { code: "sv-SE", file: "sv-SE.ts" },
       { code: "ar-SA", file: "ar-SA.ts" },
-      { code: "nl-NL", file: "nl-NL.ts" },
       { code: "vi-VN", file: "vi-VN.ts" },
-      { code: "fi-FI", file: "fi-FI.ts" },
+      { code: "uk-UA", file: "uk-UA.ts" },
       // END: MESSAGE_LOCALES
     ],
     strategy: "no_prefix",

frontend/pages/admin/manage/households/index.vue

@@ -14,6 +14,7 @@
             :items="groups"
             item-title="name"
             item-value="id"
+            :return-object="false"
             variant="filled"
             :label="$t('household.household-group')"
             :rules="[validators.required]"
@@ -93,7 +94,10 @@
                   icon
                   color="error"
                   variant="text"
-                  @click.stop="confirmDialog = true; deleteTarget = item.id"
+                  @click.stop="
+                    confirmDialog = true;
+                    deleteTarget = +item.id;
+                  "
                 >
                   <v-icon>
                     {{ $globals.icons.delete }}
@@ -110,7 +114,7 @@
   </v-container>
 </template>
 
-<script setup lang="ts">
+<script lang="ts">
 import { fieldTypes } from "~/composables/forms";
 import { useGroups } from "~/composables/use-groups";
 import { useAdminHouseholds } from "~/composables/use-households";
@@ -118,73 +122,92 @@ import { validators } from "~/composables/use-validators";
 import type { HouseholdInDB } from "~/lib/api/types/household";
 import type { VForm } from "~/types/auto-forms";
 
-definePageMeta({
+export default defineNuxtComponent({
-  layout: "admin",
+  setup() {
-});
+    definePageMeta({
+      layout: "admin",
+    });
 
-const i18n = useI18n();
+    const i18n = useI18n();
 
-useSeoMeta({
+    // Set page title
-  title: i18n.t("household.manage-households"),
+    useSeoMeta({
-});
+      title: i18n.t("household.manage-households"),
+    });
 
-const { groups } = useGroups();
+    const { groups } = useGroups();
-const { households, deleteHousehold, createHousehold } = useAdminHouseholds();
+    const { households, refreshAllHouseholds, deleteHousehold, createHousehold } = useAdminHouseholds();
+    const refNewHouseholdForm = ref<VForm | null>(null);
 
-const refNewHouseholdForm = ref<VForm | null>(null);
+    const state = reactive({
+      createDialog: false,
+      confirmDialog: false,
+      loading: false,
+      deleteTarget: 0,
+      search: "",
+      headers: [
+        {
+          title: i18n.t("household.household"),
+          align: "start",
+          sortable: false,
+          value: "id",
+        },
+        { title: i18n.t("general.name"), value: "name" },
+        { title: i18n.t("group.group"), value: "group" },
+        { title: i18n.t("user.total-users"), value: "users" },
+        { title: i18n.t("user.webhooks-enabled"), value: "webhookEnable" },
+        { title: i18n.t("general.delete"), value: "actions" },
+      ],
+      updateMode: false,
+      createHouseholdForm: {
+        items: [
+          {
+            label: i18n.t("household.household-name"),
+            varName: "name",
+            type: fieldTypes.TEXT,
+            rules: ["required"],
+          },
+        ],
+        data: {
+          groupId: "",
+          name: "",
+        },
+      },
+    });
 
-const createDialog = ref(false);
+    function openDialog() {
-const confirmDialog = ref(false);
+      state.createDialog = true;
-const deleteTarget = ref<string>("");
+      state.createHouseholdForm.data.name = "";
-const search = ref("");
+      state.createHouseholdForm.data.groupId = "";
-const updateMode = ref(false);
+    }
 
-const headers = [
+    const router = useRouter();
-  {
-    title: i18n.t("household.household"),
-    align: "start",
-    sortable: false,
-    value: "id",
-  },
-  { title: i18n.t("general.name"), value: "name" },
-  { title: i18n.t("group.group"), value: "group" },
-  { title: i18n.t("user.total-users"), value: "users" },
-  { title: i18n.t("user.webhooks-enabled"), value: "webhookEnable" },
-  { title: i18n.t("general.delete"), value: "actions" },
-];
 
-const createHouseholdForm = reactive({
+    function handleRowClick(item: HouseholdInDB) {
-  items: [
+      router.push(`/admin/manage/households/${item.id}`);
-    {
+    }
-      label: i18n.t("household.household-name"),
+
-      varName: "name",
+    async function handleCreateSubmit() {
-      type: fieldTypes.TEXT,
+      if (!refNewHouseholdForm.value?.validate()) {
-      rules: ["required"],
+        return;
-    },
+      }
-  ],
+
-  data: {
+      state.createDialog = false;
-    groupId: "",
+      await createHousehold(state.createHouseholdForm.data);
-    name: "",
+    }
+
+    return {
+      ...toRefs(state),
+      refNewHouseholdForm,
+      groups,
+      households,
+      validators,
+      refreshAllHouseholds,
+      deleteHousehold,
+      handleCreateSubmit,
+      openDialog,
+      handleRowClick,
+    };
   },
 });
-
-function openDialog() {
-  createDialog.value = true;
-  createHouseholdForm.data.name = "";
-  createHouseholdForm.data.groupId = "";
-}
-
-const router = useRouter();
-
-function handleRowClick(item: HouseholdInDB) {
-  router.push(`/admin/manage/households/${item.id}`);
-}
-
-async function handleCreateSubmit() {
-  if (!refNewHouseholdForm.value?.validate()) {
-    return;
-  }
-  createDialog.value = false;
-  await createHousehold(createHouseholdForm.data);
-}
 </script>

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

@@ -21,23 +21,26 @@
       <v-card variant="outlined">
         <v-card-text>
           <v-select
-            v-model="selectedGroup"
+            v-if="groups"
-            :items="groups || []"
+            v-model="selectedGroupId"
+            :items="groups"
             item-title="name"
-            return-object
+            item-value="id"
+            :return-object="false"
             variant="filled"
             :label="$t('group.user-group')"
             :rules="[validators.required]"
           />
           <v-select
             v-model="newUserData.household"
-            :disabled="!selectedGroup"
+            :disabled="!selectedGroupId"
             :items="households"
             item-title="name"
             item-value="name"
+            :return-object="false"
             variant="filled"
             :label="$t('household.user-household')"
-            :hint="selectedGroup ? '' : $t('group.you-must-select-a-group-before-selecting-a-household')"
+            :hint="selectedGroupId ? '' : $t('group.you-must-select-a-group-before-selecting-a-household')"
             persistent-hint
             :rules="[validators.required]"
           />
@@ -57,51 +60,82 @@
   </v-container>
 </template>
 
-<script setup lang="ts">
+<script lang="ts">
 import { useAdminApi } from "~/composables/api";
 import { useGroups } from "~/composables/use-groups";
+import { useAdminHouseholds } from "~/composables/use-households";
 import { useUserForm } from "~/composables/use-users";
 import { validators } from "~/composables/use-validators";
-import type { GroupInDB, UserIn } from "~/lib/api/types/user";
+import type { UserIn } from "~/lib/api/types/user";
 import type { VForm } from "~/types/auto-forms";
 
-definePageMeta({
+export default defineNuxtComponent({
-  layout: "admin",
+  setup() {
+    definePageMeta({
+      layout: "admin",
+    });
+
+    const { userForm } = useUserForm();
+    const { groups } = useGroups();
+    const { useHouseholdsInGroup } = useAdminHouseholds();
+    const router = useRouter();
+
+    // ==============================================
+    // New User Form
+
+    const refNewUserForm = ref<VForm | null>(null);
+
+    const adminApi = useAdminApi();
+
+    const selectedGroupId = ref<string>("");
+    const households = useHouseholdsInGroup(selectedGroupId);
+
+    const selectedGroup = computed(() => {
+      return groups.value?.find(group => group.id === selectedGroupId.value);
+    });
+    const state = reactive({
+      newUserData: {
+        username: "",
+        fullName: "",
+        email: "",
+        admin: false,
+        group: selectedGroup.value?.name || "",
+        household: "",
+        advanced: false,
+        canInvite: false,
+        canManage: false,
+        canOrganize: false,
+        password: "",
+        authMethod: "Mealie",
+      },
+    });
+    watch(selectedGroup, (newGroup) => {
+      state.newUserData.group = newGroup?.name || "";
+      state.newUserData.household = "";
+    });
+
+    async function handleSubmit() {
+      if (!refNewUserForm.value?.validate()) return;
+
+      const { response } = await adminApi.users.createOne(state.newUserData as UserIn);
+
+      if (response?.status === 201) {
+        router.push("/admin/manage/users");
+      }
+    }
+
+    return {
+      ...toRefs(state),
+      userForm,
+      refNewUserForm,
+      handleSubmit,
+      groups,
+      selectedGroupId,
+      households,
+      validators,
+    };
+  },
 });
-const { userForm } = useUserForm();
-const { groups } = useGroups();
-const router = useRouter();
-
-const refNewUserForm = ref<VForm | null>(null);
-const adminApi = useAdminApi();
-
-const selectedGroup = ref<GroupInDB | undefined>(undefined);
-const households = computed(() => selectedGroup.value?.households || []);
-
-const newUserData = ref({
-  username: "",
-  fullName: "",
-  email: "",
-  admin: false,
-  group: computed(() => selectedGroup.value?.name || ""),
-  household: "",
-  advanced: false,
-  canInvite: false,
-  canManage: false,
-  canOrganize: false,
-  password: "",
-  authMethod: "Mealie",
-});
-
-async function handleSubmit() {
-  if (!refNewUserForm.value?.validate()) return;
-
-  const { response } = await adminApi.users.createOne(newUserData.value as UserIn);
-
-  if (response?.status === 201) {
-    router.push("/admin/manage/users");
-  }
-}
 </script>
 
 <style lang="scss" scoped></style>

frontend/pages/g/[groupSlug]/index.vue

@@ -9,5 +9,11 @@ import RecipeExplorerPage from "~/components/Domain/Recipe/RecipeExplorerPage.vu
 
 export default defineNuxtComponent({
   components: { RecipeExplorerPage },
+  setup() {
+    // Enable scroll restoration for this page to work with our state management
+    definePageMeta({
+      scrollToTop: false,
+    });
+  },
 });
 </script>

mealie/repos/seed/resources/foods/locales/hu-HU.json

@@ -4,31 +4,31 @@
             "garlic": {
                 "aliases": [],
                 "description": "",
-                "name": "fokhagyma",
+                "name": "garlic",
-                "plural_name": "fokhagyma"
+                "plural_name": "garlics"
             },
             "onion": {
                 "aliases": [],
                 "description": "",
-                "name": "hagyma",
+                "name": "onion",
-                "plural_name": "hagyma"
+                "plural_name": "onions"
             },
             "bell pepper": {
                 "aliases": [],
                 "description": "",
-                "name": "kaliforniai paprika",
+                "name": "bell pepper",
-                "plural_name": "kaliforniai paprika"
+                "plural_name": "bell peppers"
             },
             "carrot": {
                 "aliases": [],
                 "description": "",
-                "name": "sárgarépa",
+                "name": "carrot",
-                "plural_name": "sárgarépa"
+                "plural_name": "carrots"
             },
             "scallion": {
                 "aliases": [],
                 "description": "",
-                "name": "újhagyma",
+                "name": "scallion",
                 "plural_name": "zöldhagyma"
             },
             "zucchini": {
@@ -52,8 +52,8 @@
             "yellow onion": {
                 "aliases": [],
                 "description": "",
-                "name": "vöröshagyma",
+                "name": "yellow onion",
-                "plural_name": "vöröshagyma"
+                "plural_name": "yellow onions"
             },
             "celery": {
                 "aliases": [],
@@ -82,8 +82,8 @@
             "cherry tomato": {
                 "aliases": [],
                 "description": "",
-                "name": "koktélparadicsom",
+                "name": "cherry tomato",
-                "plural_name": "koktélparadicsom"
+                "plural_name": "cherry tomatoes"
             },
             "cucumber": {
                 "aliases": [],
@@ -105,11 +105,11 @@
             },
             "chile pepper": {
                 "aliases": [
-                    "kaliforniai paprika"
+                    "capsicum"
                 ],
                 "description": "",
-                "name": "chili paprika",
+                "name": "chile pepper",
-                "plural_name": "chili paprika"
+                "plural_name": "chile peppers"
             },
             "sweet potato": {
                 "aliases": [],
@@ -126,20 +126,20 @@
             "heart of palm": {
                 "aliases": [],
                 "description": "",
-                "name": "pálmarügy",
+                "name": "heart of palm",
-                "plural_name": "pálmarügy"
+                "plural_name": "heart of palms"
             },
             "baby green": {
                 "aliases": [],
                 "description": "",
-                "name": "salátakeverék",
+                "name": "baby green",
-                "plural_name": "salátakeverék"
+                "plural_name": "baby greens"
             },
             "pumpkin": {
                 "aliases": [],
                 "description": "",
-                "name": "sütőtök",
+                "name": "pumpkin",
-                "plural_name": "sütőtök"
+                "plural_name": "pumpkins"
             },
             "cauliflower": {
                 "aliases": [],
@@ -151,258 +151,258 @@
                 "aliases": [],
                 "description": "",
                 "name": "káposzta",
-                "plural_name": "fejes káposzta"
+                "plural_name": "cabbages"
             },
             "asparagu": {
                 "aliases": [],
                 "description": "",
-                "name": "spárga",
+                "name": "asparagu",
-                "plural_name": "spárga"
+                "plural_name": "asparagus"
             },
             "kale": {
                 "aliases": [],
                 "description": "",
-                "name": "kelkáposzta",
+                "name": "kale",
-                "plural_name": "kelkáposzta"
+                "plural_name": "kales"
             },
             "arugula": {
                 "aliases": [],
                 "description": "",
-                "name": "rukkola",
+                "name": "arugula",
-                "plural_name": "rukkola"
+                "plural_name": "arugulas"
             },
             "leek": {
                 "aliases": [],
                 "description": "",
-                "name": "póréhagyma",
+                "name": "leek",
-                "plural_name": "póréhagyma"
+                "plural_name": "leeks"
             },
             "eggplant": {
                 "aliases": [],
                 "description": "",
-                "name": "padlizsán",
+                "name": "eggplant",
-                "plural_name": "padlizsán"
+                "plural_name": "eggplants"
             },
             "lettuce": {
                 "aliases": [],
                 "description": "",
-                "name": "saláta",
+                "name": "lettuce",
-                "plural_name": "saláta"
+                "plural_name": "lettuces"
             },
             "butternut squash": {
                 "aliases": [],
                 "description": "",
-                "name": "kanadai sütőtök",
+                "name": "butternut squash",
-                "plural_name": "kanadai sütőtök"
+                "plural_name": "butternut squashes"
             },
             "romaine": {
                 "aliases": [],
                 "description": "",
-                "name": "római saláta",
+                "name": "romaine",
-                "plural_name": "római saláta"
+                "plural_name": "romaines"
             },
             "beetroot": {
                 "aliases": [],
                 "description": "",
-                "name": "cékla",
+                "name": "beetroot",
-                "plural_name": "cékla"
+                "plural_name": "beetroots"
             },
             "brussels sprout": {
                 "aliases": [],
                 "description": "",
-                "name": "kelbimbó",
+                "name": "brussels sprout",
-                "plural_name": "kelbimbó"
+                "plural_name": "brussels sprouts"
             },
             "fennel": {
                 "aliases": [],
                 "description": "",
-                "name": "édeskömény",
+                "name": "fennel",
-                "plural_name": "édeskömény"
+                "plural_name": "fennels"
             },
             "sun dried tomato": {
                 "aliases": [],
                 "description": "",
-                "name": "szárított paradicsom",
+                "name": "sun dried tomato",
-                "plural_name": "szárított paradicsom"
+                "plural_name": "sun dried tomatoes"
             },
             "radish": {
                 "aliases": [],
                 "description": "",
-                "name": "retek",
+                "name": "radish",
-                "plural_name": "retkek"
+                "plural_name": "radishes"
             },
             "red cabbage": {
                 "aliases": [],
                 "description": "",
-                "name": "vöröskáposzta",
+                "name": "red cabbage",
-                "plural_name": "vöröskáposzta"
+                "plural_name": "red cabbages"
             },
             "artichoke": {
                 "aliases": [],
                 "description": "",
-                "name": "articsóka",
+                "name": "artichoke",
-                "plural_name": "articsóka"
+                "plural_name": "artichokes"
             },
             "new potato": {
                 "aliases": [],
                 "description": "",
-                "name": "újburgonya",
+                "name": "new potato",
-                "plural_name": "újburgonya"
+                "plural_name": "new potatoes"
             },
             "summer squash": {
                 "aliases": [
-                    "cukkini",
+                    "courgette",
-                    "kis tök"
+                    "gem squash"
                 ],
                 "description": "",
-                "name": "főzőtök",
+                "name": "summer squash",
-                "plural_name": "főzőtök"
+                "plural_name": "summer squashes"
             },
             "mixed green": {
                 "aliases": [],
                 "description": "",
-                "name": "salátakeverék",
+                "name": "mixed green",
-                "plural_name": "salátakeverék"
+                "plural_name": "mixed greens"
             },
             "parsnip": {
                 "aliases": [],
                 "description": "",
-                "name": "paszternák",
+                "name": "parsnip",
-                "plural_name": "paszternák"
+                "plural_name": "parsnips"
             },
             "baby carrot": {
                 "aliases": [],
                 "description": "",
-                "name": "bébirépa",
+                "name": "baby carrot",
-                "plural_name": "bébirépa"
+                "plural_name": "baby carrots"
             },
             "mixed vegetable": {
                 "aliases": [],
                 "description": "",
-                "name": "zöldségkeverék",
+                "name": "mixed vegetable",
-                "plural_name": "zöldségkeverék"
+                "plural_name": "mixed vegetables"
             },
             "poblano pepper": {
                 "aliases": [],
                 "description": "",
-                "name": "poblano paprika",
+                "name": "poblano pepper",
-                "plural_name": "poblano paprika"
+                "plural_name": "poblano peppers"
             },
             "sweet pepper": {
                 "aliases": [],
                 "description": "",
-                "name": "édes paprika",
+                "name": "sweet pepper",
-                "plural_name": "édes paprika"
+                "plural_name": "sweet peppers"
             },
             "serrano pepper": {
                 "aliases": [],
                 "description": "",
-                "name": "serrano paprika",
+                "name": "serrano pepper",
-                "plural_name": "serrano paprika"
+                "plural_name": "serrano peppers"
             },
             "cayenne pepper": {
                 "aliases": [],
                 "description": "",
-                "name": "cayenne bors",
+                "name": "cayenne pepper",
-                "plural_name": "cayenne bors"
+                "plural_name": "cayenne peppers"
             },
             "green tomato": {
                 "aliases": [],
                 "description": "",
-                "name": "zöld paradicsom",
+                "name": "green tomato",
-                "plural_name": "zöld paradicsom"
+                "plural_name": "green tomatoes"
             },
             "watercress": {
                 "aliases": [],
                 "description": "",
-                "name": "vízitorma",
+                "name": "watercress",
-                "plural_name": "vízitorma"
+                "plural_name": "watercress"
             },
             "iceberg": {
                 "aliases": [],
                 "description": "",
-                "name": "jégsaláta",
+                "name": "iceberg",
-                "plural_name": "jégsaláta"
+                "plural_name": "icebergs"
             },
             "mashed potato": {
                 "aliases": [],
                 "description": "",
-                "name": "burgonyapüré",
+                "name": "mashed potato",
-                "plural_name": "burgonyapüré"
+                "plural_name": "mashed potatoes"
             },
             "horseradish": {
                 "aliases": [],
                 "description": "",
-                "name": "torma",
+                "name": "horseradish",
-                "plural_name": "torma"
+                "plural_name": "horseradishes"
             },
             "chard": {
                 "aliases": [],
                 "description": "",
-                "name": "mángold",
+                "name": "chard",
-                "plural_name": "mángold"
+                "plural_name": "chards"
             },
             "pimiento": {
                 "aliases": [],
                 "description": "",
-                "name": "kápia paprika",
+                "name": "pimiento",
-                "plural_name": "kápia paprika"
+                "plural_name": "pimientoes"
             },
             "spaghetti squash": {
                 "aliases": [],
                 "description": "",
-                "name": "spagettitök",
+                "name": "spaghetti squash",
-                "plural_name": "spagettitök"
+                "plural_name": "spaghetti squashes"
             },
             "butter lettuce": {
                 "aliases": [],
                 "description": "",
-                "name": "fejes saláta",
+                "name": "butter lettuce",
-                "plural_name": "fejes saláta"
+                "plural_name": "butter lettuces"
             },
             "hash brown": {
                 "aliases": [],
                 "description": "",
-                "name": "tócsni",
+                "name": "hash brown",
-                "plural_name": "tócsni"
+                "plural_name": "hash browns"
             },
             "napa cabbage": {
                 "aliases": [
-                    "kínai kel"
+                    "chinese  leaves"
                 ],
                 "description": "",
-                "name": "kínai kel",
+                "name": "napa cabbage",
-                "plural_name": "kínai kel"
+                "plural_name": "napa cabbages"
             },
             "celeriac": {
                 "aliases": [],
                 "description": "",
-                "name": "zeller",
+                "name": "celeriac",
-                "plural_name": "zeller"
+                "plural_name": "celeriacs"
             },
             "water chestnut": {
                 "aliases": [],
                 "description": "",
-                "name": "vízigesztenye",
+                "name": "water chestnut",
-                "plural_name": "vízigesztenye"
+                "plural_name": "water chestnuts"
             },
             "turnip": {
                 "aliases": [],
                 "description": "",
-                "name": "tarlórépa",
+                "name": "turnip",
-                "plural_name": "tarlórépa"
+                "plural_name": "turnips"
             },
             "thai chile pepper": {
                 "aliases": [],
                 "description": "",
-                "name": "thai csili paprika",
+                "name": "thai chile pepper",
-                "plural_name": "thai csili paprika"
+                "plural_name": "thai chile peppers"
             },
             "bok choy": {
                 "aliases": [],
                 "description": "",
-                "name": "bordáskel",
+                "name": "bok choy",
-                "plural_name": "bordáskel"
+                "plural_name": "bok choy"
             },
             "okra": {
                 "aliases": [],
@@ -413,44 +413,44 @@
             "acorn squash": {
                 "aliases": [],
                 "description": "",
-                "name": "makktök",
+                "name": "acorn squash",
-                "plural_name": "makktök"
+                "plural_name": "acorn squashes"
             },
             "corn cob": {
                 "aliases": [],
                 "description": "",
-                "name": "kukoricacső",
+                "name": "corn cob",
-                "plural_name": "kukoricacső"
+                "plural_name": "corn cobs"
             },
             "radicchio": {
                 "aliases": [],
                 "description": "",
-                "name": "vörös cikória",
+                "name": "radicchio",
-                "plural_name": "vörös cikória"
+                "plural_name": "radicchio"
             },
             "pearl onion": {
                 "aliases": [],
                 "description": "",
-                "name": "gyöngyhagyma",
+                "name": "pearl onion",
-                "plural_name": "gyöngyhagyma"
+                "plural_name": "pearl onions"
             },
             "tenderstem broccoli": {
                 "aliases": [],
                 "description": "",
-                "name": "brokkolini",
+                "name": "tenderstem broccoli",
-                "plural_name": "brokkolini"
+                "plural_name": "tenderstem broccolis"
             },
             "plantain": {
                 "aliases": [],
                 "description": "",
-                "name": "főzőbanán",
+                "name": "plantain",
-                "plural_name": "főzőbanán"
+                "plural_name": "plantains"
             },
             "leaf lettuce": {
                 "aliases": [],
                 "description": "",
-                "name": "saláta",
+                "name": "leaf lettuce",
-                "plural_name": "saláta"
+                "plural_name": "leaf lettuces"
             },
             "pepperoncini": {
                 "aliases": [],
@@ -602,25 +602,25 @@
                 "aliases": [],
                 "description": "",
                 "name": "arbol chile pepper",
-                "plural_name": "arbol csili paprika"
+                "plural_name": "arbol chile peppers"
             },
             "golden beet": {
                 "aliases": [],
                 "description": "",
-                "name": "sárga cékla",
+                "name": "golden beet",
-                "plural_name": "sárga cékla"
+                "plural_name": "golden beets"
             },
             "pea shoot": {
                 "aliases": [],
                 "description": "",
-                "name": "borsócsíra",
+                "name": "pea shoot",
-                "plural_name": "borsócsíra"
+                "plural_name": "pea shoots"
             },
             "alfalfa": {
                 "aliases": [],
                 "description": "",
-                "name": "lucernacsíra",
+                "name": "alfalfa",
-                "plural_name": "lucernacsíra"
+                "plural_name": "alfalfas"
             }
         }
     },
@@ -628,129 +628,129 @@
         "foods": {
             "tomato": {
                 "aliases": [],
-                "description": "Igen, gyümölcs",
+                "description": "Yes they are a fruit",
-                "name": "paradicsom",
+                "name": "tomato",
-                "plural_name": "paradicsom"
+                "plural_name": "tomatoes"
             },
             "lemon": {
                 "aliases": [],
                 "description": "",
-                "name": "citrom",
+                "name": "lemon",
-                "plural_name": "citrom"
+                "plural_name": "lemons"
             },
             "lime": {
                 "aliases": [],
                 "description": "",
-                "name": "zöldcitrom",
+                "name": "lime",
-                "plural_name": "zöldcitrom"
+                "plural_name": "limes"
             },
             "apple": {
                 "aliases": [],
                 "description": "",
-                "name": "alma",
+                "name": "apple",
-                "plural_name": "alma"
+                "plural_name": "apples"
             },
             "banana": {
                 "aliases": [],
                 "description": "",
-                "name": "banán",
+                "name": "banana",
-                "plural_name": "banán"
+                "plural_name": "bananas"
             },
             "orange": {
                 "aliases": [],
                 "description": "",
-                "name": "narancs",
+                "name": "orange",
-                "plural_name": "narancs"
+                "plural_name": "oranges"
             },
             "raisin": {
                 "aliases": [],
                 "description": "",
-                "name": "mazsola",
+                "name": "raisin",
-                "plural_name": "mazsola"
+                "plural_name": "raisins"
             },
             "pineapple": {
                 "aliases": [],
                 "description": "",
-                "name": "ananász",
+                "name": "pineapple",
-                "plural_name": "ananász"
+                "plural_name": "pineapples"
             },
             "mango": {
                 "aliases": [],
                 "description": "",
-                "name": "mangó",
+                "name": "mango",
-                "plural_name": "mangó"
+                "plural_name": "mangoes"
             },
             "peach": {
                 "aliases": [],
                 "description": "",
-                "name": "őszibarack",
+                "name": "peach",
-                "plural_name": "őszibarack"
+                "plural_name": "peaches"
             },
             "date": {
                 "aliases": [],
                 "description": "",
-                "name": "datolya",
+                "name": "date",
-                "plural_name": "datolya"
+                "plural_name": "dates"
             },
             "coconut": {
                 "aliases": [],
                 "description": "",
-                "name": "kókuszdió",
+                "name": "coconut",
-                "plural_name": "kókuszdió"
+                "plural_name": "coconuts"
             },
             "craisin": {
                 "aliases": [],
                 "description": "",
-                "name": "aszalt vörösáfonya",
+                "name": "craisin",
-                "plural_name": "aszalt vörösáfonya"
+                "plural_name": "craisins"
             },
             "pear": {
                 "aliases": [],
                 "description": "",
-                "name": "körte",
+                "name": "pear",
-                "plural_name": "körte"
+                "plural_name": "pears"
             },
             "grape": {
                 "aliases": [],
                 "description": "",
-                "name": "szőlő",
+                "name": "grape",
-                "plural_name": "szőlő"
+                "plural_name": "grapes"
             },
             "pomegranate": {
                 "aliases": [],
                 "description": "",
-                "name": "gránátalma",
+                "name": "pomegranate",
-                "plural_name": "gránátalma"
+                "plural_name": "pomegranates"
             },
             "watermelon": {
                 "aliases": [],
                 "description": "",
-                "name": "görögdinnye",
+                "name": "watermelon",
-                "plural_name": "görögdinnye"
+                "plural_name": "watermelons"
             },
             "rhubarb": {
                 "aliases": [],
                 "description": "",
-                "name": "rebarbara",
+                "name": "rhubarb",
-                "plural_name": "rebarbara"
+                "plural_name": "rhubarbs"
             },
             "dried apricot": {
                 "aliases": [],
                 "description": "",
-                "name": "aszalt sárgabarack",
+                "name": "dried apricot",
-                "plural_name": "aszalt sárgabarack"
+                "plural_name": "dried apricots"
             },
             "kiwi": {
                 "aliases": [],
                 "description": "",
-                "name": "kivi",
+                "name": "kiwi",
-                "plural_name": "kivi"
+                "plural_name": "kiwis"
             },
             "grapefruit": {
                 "aliases": [],
                 "description": "",
                 "name": "grapefruit",
-                "plural_name": "grapefruit"
+                "plural_name": "grapefruits"
             },
             "plum": {
                 "aliases": [],
@@ -905,86 +905,86 @@
             "banana chip": {
                 "aliases": [],
                 "description": "",
-                "name": "banánchips",
+                "name": "banana chip",
-                "plural_name": "banánchips"
+                "plural_name": "banana chips"
             },
             "kumquat": {
                 "aliases": [],
                 "description": "",
-                "name": "törpemandarin",
+                "name": "kumquat",
-                "plural_name": "törpemandarin"
+                "plural_name": "kumquats"
             },
             "jackfruit": {
                 "aliases": [],
                 "description": "",
                 "name": "jackfruit",
-                "plural_name": "jackfruit"
+                "plural_name": "jackfruits"
             },
             "dragon fruit": {
                 "aliases": [],
                 "description": "",
-                "name": "sárkánygyümölcs",
+                "name": "dragon fruit",
-                "plural_name": "sárkánygyümölcs"
+                "plural_name": "dragon fruits"
             },
             "mixed fruit": {
                 "aliases": [],
                 "description": "",
-                "name": "vegyes gyümölcs",
+                "name": "mixed fruit",
-                "plural_name": "vegyes gyümölcs"
+                "plural_name": "mixed fruits"
             },
             "asian pear": {
                 "aliases": [],
                 "description": "",
-                "name": "japán körte",
+                "name": "asian pear",
-                "plural_name": "japán körte"
+                "plural_name": "asian pears"
             },
             "lychee": {
                 "aliases": [],
                 "description": "",
-                "name": "licsi",
+                "name": "lychee",
-                "plural_name": "licsi"
+                "plural_name": "lychees"
             },
             "young coconut": {
                 "aliases": [],
                 "description": "",
-                "name": "zsenge kókuszdió",
+                "name": "young coconut",
-                "plural_name": "zsenge kókuszdió"
+                "plural_name": "young coconuts"
             },
             "kaffir lime": {
                 "aliases": [],
                 "description": "",
                 "name": "kaffir lime",
-                "plural_name": "kaffir lime"
+                "plural_name": "kaffir limes"
             },
             "star fruit": {
                 "aliases": [],
                 "description": "",
-                "name": "csillaggyümölcs",
+                "name": "star fruit",
-                "plural_name": "csillaggyümölcs"
+                "plural_name": "star fruits"
             },
             "green papaya": {
                 "aliases": [],
                 "description": "",
-                "name": "zöld papaya",
+                "name": "green papaya",
-                "plural_name": "zöld papaya"
+                "plural_name": "green papayas"
             },
             "pomelo": {
                 "aliases": [],
                 "description": "",
                 "name": "pomelo",
-                "plural_name": "pomelo"
+                "plural_name": "pomeloes"
             },
             "chestnut puree": {
                 "aliases": [],
                 "description": "",
-                "name": "gesztenyepüré",
+                "name": "chestnut puree",
-                "plural_name": "gesztenyepüré"
+                "plural_name": "chestnut purees"
             },
             "prickly pear": {
                 "aliases": [],
                 "description": "",
-                "name": "kaktuszfüge",
+                "name": "prickly pear",
-                "plural_name": "kaktuszfüge"
+                "plural_name": "prickly pears"
             },
             "calamansi": {
                 "aliases": [],

mealie/repos/seed/resources/foods/locales/nl-NL.json

@@ -255,7 +255,7 @@
                     "edelpompoen"
                 ],
                 "description": "",
-                "name": "edelpompoenen",
+                "name": "summer squash",
                 "plural_name": "edelpompoenen"
             },
             "mixed green": {
@@ -536,7 +536,7 @@
                 "aliases": [],
                 "description": "",
                 "name": "yamswortel",
-                "plural_name": "yamswortel"
+                "plural_name": "yams"
             },
             "ancho chile pepper": {
                 "aliases": [],
@@ -547,8 +547,8 @@
             "microgreen": {
                 "aliases": [],
                 "description": "",
-                "name": "microgroen",
+                "name": "microgreen",
-                "plural_name": "kiemgroenten"
+                "plural_name": "microgreens"
             },
             "boston lettuce": {
                 "aliases": [],
@@ -559,55 +559,55 @@
             "kohlrabi": {
                 "aliases": [],
                 "description": "",
-                "name": "koolrabi",
+                "name": "kohlrabi",
-                "plural_name": "koolrabi's"
+                "plural_name": "kohlrabis"
             },
             "fresno chile": {
                 "aliases": [],
                 "description": "",
-                "name": "fresno peper",
+                "name": "fresno chile",
-                "plural_name": "fresno pepers"
+                "plural_name": "fresno chiles"
             },
             "delicata squash": {
                 "aliases": [],
                 "description": "",
-                "name": "delicata pompoen",
+                "name": "delicata squash",
-                "plural_name": "delicata pompoenen"
+                "plural_name": "delicata squashes"
             },
             "frisee": {
                 "aliases": [],
                 "description": "",
-                "name": "krulandijvie",
+                "name": "frisee",
-                "plural_name": "krulandijvie"
+                "plural_name": "frisees"
             },
             "anaheim pepper": {
                 "aliases": [],
                 "description": "",
-                "name": "anaheim peper",
+                "name": "anaheim pepper",
-                "plural_name": "anaheim pepers"
+                "plural_name": "anaheim peppers"
             },
             "cres": {
                 "aliases": [],
                 "description": "",
-                "name": "kropsla",
+                "name": "cres",
-                "plural_name": "kropsla"
+                "plural_name": "cress"
             },
             "broccoli slaw": {
                 "aliases": [],
                 "description": "",
-                "name": "broccoli salade",
+                "name": "broccoli slaw",
-                "plural_name": "broccoli salades"
+                "plural_name": "broccoli slaws"
             },
             "arbol chile pepper": {
                 "aliases": [],
                 "description": "",
-                "name": "arbol peper",
+                "name": "arbol chile pepper",
-                "plural_name": "arbol pepers"
+                "plural_name": "arbol chile peppers"
             },
             "golden beet": {
                 "aliases": [],
                 "description": "",
-                "name": "gele biet",
+                "name": "golden beet",
                 "plural_name": "gele biet"
             },
             "pea shoot": {
@@ -628,8 +628,8 @@
         "foods": {
             "tomato": {
                 "aliases": [],
-                "description": "Ja, ze zijn fruit",
+                "description": "Yes they are a fruit",
-                "name": "tomaat",
+                "name": "tomato",
                 "plural_name": "tomaten"
             },
             "lemon": {
@@ -839,14 +839,14 @@
             "meyer lemon": {
                 "aliases": [],
                 "description": "",
-                "name": "meyer citroen",
+                "name": "meyer lemon",
-                "plural_name": "meyer citroenen"
+                "plural_name": "meyer lemons"
             },
             "honeydew melon": {
                 "aliases": [],
                 "description": "",
-                "name": "honing meloen",
+                "name": "honeydew melon",
-                "plural_name": "honing meloenen"
+                "plural_name": "honeydew melons"
             },
             "dried fruit": {
                 "aliases": [],
@@ -863,50 +863,50 @@
             "persimmon": {
                 "aliases": [],
                 "description": "",
-                "name": "kakivrucht",
+                "name": "persimmon",
-                "plural_name": "kakivruchten"
+                "plural_name": "persimmons"
             },
             "melon": {
                 "aliases": [],
                 "description": "",
-                "name": "meloen",
+                "name": "melon",
-                "plural_name": "meloenen"
+                "plural_name": "melons"
             },
             "tangerine": {
                 "aliases": [],
                 "description": "",
-                "name": "mandarijn",
+                "name": "tangerine",
-                "plural_name": "mandarijnen"
+                "plural_name": "tangerines"
             },
             "dried mango": {
                 "aliases": [],
                 "description": "",
-                "name": "gedroogde mango",
+                "name": "dried mango",
-                "plural_name": "gedroogde mango's"
+                "plural_name": "dried mangoes"
             },
             "dried apple": {
                 "aliases": [],
                 "description": "",
-                "name": "gedroogde appel",
+                "name": "dried apple",
-                "plural_name": "gedroogde appels"
+                "plural_name": "dried apples"
             },
             "quince": {
                 "aliases": [],
                 "description": "",
-                "name": "kweepeer",
+                "name": "quince",
-                "plural_name": "kweeperen"
+                "plural_name": "quinces"
             },
             "guava": {
                 "aliases": [],
                 "description": "",
-                "name": "guave",
+                "name": "guava",
-                "plural_name": "guava's"
+                "plural_name": "guavas"
             },
             "banana chip": {
                 "aliases": [],
                 "description": "",
-                "name": "bananen chip",
+                "name": "banana chip",
-                "plural_name": "bananen chips"
+                "plural_name": "banana chips"
             },
             "kumquat": {
                 "aliases": [],
@@ -923,20 +923,20 @@
             "dragon fruit": {
                 "aliases": [],
                 "description": "",
-                "name": "drakenfruit",
+                "name": "dragon fruit",
-                "plural_name": "drakenfruit vruchten"
+                "plural_name": "dragon fruits"
             },
             "mixed fruit": {
                 "aliases": [],
                 "description": "",
-                "name": "gemixte vruchten",
+                "name": "mixed fruit",
-                "plural_name": "gemengde vruchten"
+                "plural_name": "mixed fruits"
             },
             "asian pear": {
                 "aliases": [],
                 "description": "",
-                "name": "aziatische peer",
+                "name": "asian pear",
-                "plural_name": "aziatische peren"
+                "plural_name": "asian pears"
             },
             "lychee": {
                 "aliases": [],
@@ -947,44 +947,44 @@
             "young coconut": {
                 "aliases": [],
                 "description": "",
-                "name": "jonge kokokosnoot",
+                "name": "young coconut",
-                "plural_name": "jonge kokokosnoten"
+                "plural_name": "young coconuts"
             },
             "kaffir lime": {
                 "aliases": [],
                 "description": "",
-                "name": "kaffir limoen",
+                "name": "kaffir lime",
-                "plural_name": "kaffir limoenen"
+                "plural_name": "kaffir limes"
             },
             "star fruit": {
                 "aliases": [],
                 "description": "",
-                "name": "stervrucht",
+                "name": "star fruit",
-                "plural_name": "stervruchten"
+                "plural_name": "star fruits"
             },
             "green papaya": {
                 "aliases": [],
                 "description": "",
-                "name": "groene papaya",
+                "name": "green papaya",
-                "plural_name": "groene papaya's"
+                "plural_name": "green papayas"
             },
             "pomelo": {
                 "aliases": [],
                 "description": "",
-                "name": "pompelmoes",
+                "name": "pomelo",
-                "plural_name": "pompelmoezen"
+                "plural_name": "pomeloes"
             },
             "chestnut puree": {
                 "aliases": [],
                 "description": "",
-                "name": "kastanje puree",
+                "name": "chestnut puree",
-                "plural_name": "kastanje puree"
+                "plural_name": "chestnut purees"
             },
             "prickly pear": {
                 "aliases": [],
                 "description": "",
-                "name": "cactusvijg",
+                "name": "prickly pear",
-                "plural_name": "cactusvijgen"
+                "plural_name": "prickly pears"
             },
             "calamansi": {
                 "aliases": [],
@@ -1055,56 +1055,56 @@
             "dried lemon": {
                 "aliases": [],
                 "description": "",
-                "name": "gedroogde limoen",
+                "name": "dried lemon",
-                "plural_name": "gedroogde limoenen"
+                "plural_name": "dried lemons"
             },
             "young jackfruit": {
                 "aliases": [],
                 "description": "",
-                "name": "jonge jackfruit",
+                "name": "young jackfruit",
-                "plural_name": "jonge jackfruits"
+                "plural_name": "young jackfruits"
             },
             "durian": {
                 "aliases": [],
                 "description": "",
-                "name": "doerian",
+                "name": "durian",
-                "plural_name": "doerians"
+                "plural_name": "durians"
             },
             "freeze-dried apple": {
                 "aliases": [],
                 "description": "",
-                "name": "gevriesdroogde appel",
+                "name": "freeze-dried apple",
-                "plural_name": "gevriesdroogde appels"
+                "plural_name": "freeze-dried apples"
             },
             "dried tamarind": {
                 "aliases": [],
                 "description": "",
-                "name": "gedroogte tamarinde",
+                "name": "dried tamarind",
-                "plural_name": "gedroogde tamarindes"
+                "plural_name": "dried tamarinds"
             },
             "honey date": {
                 "aliases": [],
                 "description": "",
-                "name": "honing dadel",
+                "name": "honey date",
-                "plural_name": "honing dadels"
+                "plural_name": "honey dates"
             },
             "physali": {
                 "aliases": [],
                 "description": "",
-                "name": "ananaskers",
+                "name": "physali",
-                "plural_name": "ananaskersen"
+                "plural_name": "physalis"
             },
             "tamarillo": {
                 "aliases": [],
                 "description": "",
                 "name": "tamarillo",
-                "plural_name": "tamarillo's"
+                "plural_name": "tamarilloes"
             },
             "ice-apple": {
                 "aliases": [],
                 "description": "",
-                "name": "ijsappel",
+                "name": "ice-apple",
-                "plural_name": "ijsappels"
+                "plural_name": "ice-apples"
             },
             "longan": {
                 "aliases": [],
@@ -1115,98 +1115,98 @@
             "finger lime": {
                 "aliases": [],
                 "description": "",
-                "name": "citroenkaviaar",
+                "name": "finger lime",
-                "plural_name": "citroenkaviaar"
+                "plural_name": "finger limes"
             },
             "bitter orange": {
                 "aliases": [],
                 "description": "",
-                "name": "bittersinaasappel",
+                "name": "bitter orange",
-                "plural_name": "bittersinaasappels"
+                "plural_name": "bitter oranges"
             },
             "feijoa": {
                 "aliases": [],
                 "description": "",
-                "name": "ananasguave",
+                "name": "feijoa",
-                "plural_name": "ananasguaves"
+                "plural_name": "feijoas"
             },
             "dried persimmon": {
                 "aliases": [],
                 "description": "",
-                "name": "gedroogde kakivrucht",
+                "name": "dried persimmon",
-                "plural_name": "gedroogde kakivruchten"
+                "plural_name": "dried persimmons"
             },
             "rambutan": {
                 "aliases": [],
                 "description": "",
-                "name": "ramboetan",
+                "name": "rambutan",
-                "plural_name": "ramboetans"
+                "plural_name": "rambutans"
             },
             "rose apple": {
                 "aliases": [],
                 "description": "",
-                "name": "rozenappel",
+                "name": "rose apple",
-                "plural_name": "rozenappels"
+                "plural_name": "rose apples"
             },
             "dried orange slice": {
                 "aliases": [],
                 "description": "",
-                "name": "gedroogd sinaasappel partje",
+                "name": "dried orange slice",
-                "plural_name": "gedroogdesinaasappel partjes"
+                "plural_name": "dried orange slices"
             },
             "loquat": {
                 "aliases": [],
                 "description": "",
-                "name": "japanse pruim",
+                "name": "loquat",
-                "plural_name": "japanse pruimen"
+                "plural_name": "loquats"
             },
             "crabapple": {
                 "aliases": [],
                 "description": "",
-                "name": "wilde appel",
+                "name": "crabapple",
-                "plural_name": "wilde appels"
+                "plural_name": "crabapples"
             },
             "fig leaf": {
                 "aliases": [],
                 "description": "",
-                "name": "vijgenblad",
+                "name": "fig leaf",
-                "plural_name": "vijgenbladeren"
+                "plural_name": "fig leaves"
             },
             "freeze-dried pineapple": {
                 "aliases": [],
                 "description": "",
-                "name": "gevriesdroogde ananas",
+                "name": "freeze-dried pineapple",
-                "plural_name": "gevriesdroogde ananas"
+                "plural_name": "freeze-dried pineapples"
             },
             "pluot": {
                 "aliases": [],
                 "description": "",
-                "name": "pruim-abrikoos",
+                "name": "pluot",
-                "plural_name": "pruim-abrikozen"
+                "plural_name": "pluots"
             },
             "soursop": {
                 "aliases": [],
                 "description": "",
-                "name": "zuurzak",
+                "name": "soursop",
-                "plural_name": "zuurzakken"
+                "plural_name": "soursops"
             },
             "hog plum": {
                 "aliases": [],
                 "description": "",
-                "name": "varkenspruim",
+                "name": "hog plum",
-                "plural_name": "varkenspruimen"
+                "plural_name": "hog plums"
             },
             "bergamot orange": {
                 "aliases": [],
                 "description": "",
-                "name": "bergamot",
+                "name": "bergamot orange",
-                "plural_name": "bergamotten"
+                "plural_name": "bergamot oranges"
             },
             "luo han guo": {
                 "aliases": [],
                 "description": "",
-                "name": "monniksfruit",
+                "name": "luo han guo",
-                "plural_name": "monniksfruit"
+                "plural_name": "luo han guos"
             },
             "mamey": {
                 "aliases": [],
@@ -1223,14 +1223,14 @@
             "green ume plum": {
                 "aliases": [],
                 "description": "",
-                "name": "groene ume pruim",
+                "name": "green ume plum",
-                "plural_name": "groene ume pruimen"
+                "plural_name": "green ume plums"
             },
             "kiwano": {
                 "aliases": [],
                 "description": "",
-                "name": "hoornmeloen",
+                "name": "kiwano",
-                "plural_name": "hoornmeloenen"
+                "plural_name": "kiwanoes"
             }
         }
     },
@@ -1239,104 +1239,104 @@
             "button mushroom": {
                 "aliases": [],
                 "description": "",
-                "name": "champignon",
+                "name": "button mushroom",
-                "plural_name": "champignons"
+                "plural_name": "button mushrooms"
             },
             "shiitake mushroom": {
                 "aliases": [],
                 "description": "",
-                "name": "shiitake",
+                "name": "shiitake mushroom",
-                "plural_name": "shiitakes"
+                "plural_name": "shiitake mushrooms"
             },
             "portobello mushroom": {
                 "aliases": [],
                 "description": "",
-                "name": "portobello",
+                "name": "portobello mushroom",
-                "plural_name": "portobello's"
+                "plural_name": "portobello mushrooms"
             },
             "wild mushroom": {
                 "aliases": [],
                 "description": "",
-                "name": "wilde paddenstoel",
+                "name": "wild mushroom",
-                "plural_name": "wilde paddenstoelen"
+                "plural_name": "wild mushrooms"
             },
             "porcini": {
                 "aliases": [],
                 "description": "",
-                "name": "eekhoorntjesbrood",
+                "name": "porcini",
-                "plural_name": "eekhoorntjesbrood"
+                "plural_name": "porcinis"
             },
             "mixed mushroom": {
                 "aliases": [],
                 "description": "",
-                "name": "gemengde paddenstoelen",
+                "name": "mixed mushroom",
-                "plural_name": "gemengde paddenstoelen"
+                "plural_name": "mixed mushrooms"
             },
             "oyster mushroom": {
                 "aliases": [],
                 "description": "",
-                "name": "oesterzwam",
+                "name": "oyster mushroom",
-                "plural_name": "oesterzwammen"
+                "plural_name": "oyster mushrooms"
             },
             "chestnut mushroom": {
                 "aliases": [],
                 "description": "",
-                "name": "kastanje champignon",
+                "name": "chestnut mushroom",
-                "plural_name": "kastanje champignons"
+                "plural_name": "chestnut mushrooms"
             },
             "enoki mushroom": {
                 "aliases": [],
                 "description": "",
-                "name": "enoki-paddenstoel",
+                "name": "enoki mushroom",
-                "plural_name": "enoki-paddenstoeltjes"
+                "plural_name": "enoki mushrooms"
             },
             "black fungu": {
                 "aliases": [],
                 "description": "",
-                "name": "boomoor",
+                "name": "black fungu",
-                "plural_name": "boomoren"
+                "plural_name": "black fungus"
             },
             "black truffle": {
                 "aliases": [],
                 "description": "",
-                "name": "zwarte truffel",
+                "name": "black truffle",
-                "plural_name": "zwarte truffels"
+                "plural_name": "black truffles"
             },
             "morel mushroom": {
                 "aliases": [],
                 "description": "",
-                "name": "morel paddenstoel",
+                "name": "morel mushroom",
-                "plural_name": "morel paddenstoelen"
+                "plural_name": "morel mushrooms"
             },
             "field mushroom": {
                 "aliases": [],
                 "description": "",
-                "name": "veld paddestoel",
+                "name": "field mushroom",
-                "plural_name": "veld paddenstoelen"
+                "plural_name": "field mushrooms"
             },
             "king oyster mushroom": {
                 "aliases": [],
                 "description": "",
-                "name": "koning oesterzwam",
+                "name": "king oyster mushroom",
-                "plural_name": "koning oesterzwammen"
+                "plural_name": "king oyster mushrooms"
             },
             "shimeji mushroom": {
                 "aliases": [],
                 "description": "",
-                "name": "shimeji paddenstoel",
+                "name": "shimeji mushroom",
-                "plural_name": "shimeji paddenstoelen"
+                "plural_name": "shimeji mushrooms"
             },
             "straw mushroom": {
                 "aliases": [],
                 "description": "",
-                "name": "stro paddenstoel",
+                "name": "straw mushroom",
-                "plural_name": "stro paddenstoelen"
+                "plural_name": "straw mushrooms"
             },
             "dried chinese mushroom": {
                 "aliases": [],
                 "description": "",
-                "name": "gedroogde chinese paddenstoel",
+                "name": "dried chinese mushroom",
-                "plural_name": "gedroogde chinese paddenstoelen"
+                "plural_name": "dried chinese mushrooms"
             },
             "maitake": {
                 "aliases": [],
@@ -1347,79 +1347,79 @@
             "trumpet mushroom": {
                 "aliases": [],
                 "description": "",
-                "name": "trompet paddenstoel",
+                "name": "trumpet mushroom",
-                "plural_name": "trompet paddenstoelen"
+                "plural_name": "trumpet mushrooms"
             },
             "white truffle": {
                 "aliases": [],
                 "description": "",
-                "name": "witte truffel",
+                "name": "white truffle",
-                "plural_name": "witte truffels"
+                "plural_name": "white truffles"
             },
             "white fungu": {
                 "aliases": [],
                 "description": "",
-                "name": "witte zwam",
+                "name": "white fungu",
-                "plural_name": "witte zwammen"
+                "plural_name": "white fungus"
             },
             "pioppini": {
                 "aliases": [],
                 "description": "",
-                "name": "pioppino-zwam",
+                "name": "pioppini",
-                "plural_name": "pioppino-zwammen"
+                "plural_name": "pioppinis"
             },
             "snow fungu": {
                 "aliases": [],
                 "description": "",
-                "name": "sneeuwzwam",
+                "name": "snow fungu",
-                "plural_name": "sneeuwzwammen"
+                "plural_name": "snow fungus"
             },
             "white beech mushroom": {
                 "aliases": [],
                 "description": "",
-                "name": "witte beukenzwam",
+                "name": "white beech mushroom",
-                "plural_name": "witte beukenzwammen"
+                "plural_name": "white beech mushrooms"
             },
             "boletu": {
                 "aliases": [],
                 "description": "",
-                "name": "boleet",
+                "name": "boletu",
-                "plural_name": "boleten"
+                "plural_name": "boletus"
             },
             "huitlacoche": {
                 "aliases": [],
                 "description": "",
-                "name": "maïsbrand",
+                "name": "huitlacoche",
-                "plural_name": "maïsbrand"
+                "plural_name": "huitlacoches"
             },
             "matsutake": {
                 "aliases": [],
                 "description": "",
-                "name": "pijnboomzwam",
+                "name": "matsutake",
-                "plural_name": "pijnboomzwammen"
+                "plural_name": "matsutakes"
             },
             "nameko": {
                 "aliases": [],
                 "description": "",
-                "name": "bundelzwam",
+                "name": "nameko",
-                "plural_name": "bundelzwammen"
+                "plural_name": "namekoes"
             },
             "djon djon mushroom": {
                 "aliases": [],
                 "description": "",
-                "name": "zwarte trompetzwam",
+                "name": "djon djon mushroom",
-                "plural_name": "zwarte trompetzwammen"
+                "plural_name": "djon djon mushrooms"
             },
             "mixed asian mushroom": {
                 "aliases": [],
                 "description": "",
-                "name": "gemengde aziatische paddenstoelen",
+                "name": "mixed asian mushroom",
-                "plural_name": "gemengde aziatische paddenstoelen"
+                "plural_name": "mixed asian mushrooms"
             },
             "puffball": {
                 "aliases": [],
                 "description": "",
-                "name": "bovist",
+                "name": "puffball",
                 "plural_name": "puffballs"
             },
             "honey fungu": {
@@ -1453,98 +1453,98 @@
             "strawberry": {
                 "aliases": [],
                 "description": "",
-                "name": "aardbei",
+                "name": "strawberry",
-                "plural_name": "aardbeien"
+                "plural_name": "strawberries"
             },
             "blueberry": {
                 "aliases": [],
                 "description": "",
-                "name": "bosbes",
+                "name": "blueberry",
-                "plural_name": "bosbessen"
+                "plural_name": "blueberries"
             },
             "raspberry": {
                 "aliases": [],
                 "description": "",
-                "name": "framboos",
+                "name": "raspberry",
-                "plural_name": "frambozen"
+                "plural_name": "raspberries"
             },
             "cranberry": {
                 "aliases": [],
                 "description": "",
-                "name": "veenbes",
+                "name": "cranberry",
-                "plural_name": "veenbessen"
+                "plural_name": "cranberries"
             },
             "cherry": {
                 "aliases": [],
                 "description": "",
-                "name": "kers",
+                "name": "cherry",
-                "plural_name": "kersen"
+                "plural_name": "cherries"
             },
             "blackberry": {
                 "aliases": [],
                 "description": "",
-                "name": "braam",
+                "name": "blackberry",
-                "plural_name": "bramen"
+                "plural_name": "blackberries"
             },
             "berry mix": {
                 "aliases": [],
                 "description": "",
-                "name": "gemengde bessen",
+                "name": "berry mix",
-                "plural_name": "gemengde bessen"
+                "plural_name": "berry mixes"
             },
             "maraschino cherry": {
                 "aliases": [],
                 "description": "",
-                "name": "maraschino kers",
+                "name": "maraschino cherry",
-                "plural_name": "maraschino kersen"
+                "plural_name": "maraschino cherries"
             },
             "dried cherry": {
                 "aliases": [],
                 "description": "",
-                "name": "gedroogde kers",
+                "name": "dried cherry",
-                "plural_name": "gedroogde kersen"
+                "plural_name": "dried cherries"
             },
             "juniper berry": {
                 "aliases": [],
                 "description": "",
-                "name": "jeneverbes",
+                "name": "juniper berry",
-                "plural_name": "jeneverbessen"
+                "plural_name": "juniper berries"
             },
             "sour cherry": {
                 "aliases": [],
                 "description": "",
-                "name": "zure kers",
+                "name": "sour cherry",
-                "plural_name": "zure kersen"
+                "plural_name": "sour cherries"
             },
             "goji berry": {
                 "aliases": [],
                 "description": "",
-                "name": "goji bes",
+                "name": "goji berry",
-                "plural_name": "goji bessen"
+                "plural_name": "goji berries"
             },
             "dried blueberry": {
                 "aliases": [],
                 "description": "",
-                "name": "gedroogde bosbes",
+                "name": "dried blueberry",
-                "plural_name": "gedroogde bosbessen"
+                "plural_name": "dried blueberries"
             },
             "freeze-dried strawberry": {
                 "aliases": [],
                 "description": "",
-                "name": "gevriesdroogde aardbei",
+                "name": "freeze-dried strawberry",
-                "plural_name": "gevriesdroogde aardbeien"
+                "plural_name": "freeze-dried strawberries"
             },
             "gooseberry": {
                 "aliases": [],
                 "description": "",
-                "name": "kruisbes",
+                "name": "gooseberry",
-                "plural_name": "kruisbessen"
+                "plural_name": "gooseberries"
             },
             "freeze-dried raspberry": {
                 "aliases": [],
                 "description": "",
-                "name": "gevriesdroogde framboos",
+                "name": "freeze-dried raspberry",
-                "plural_name": "gevriesdroogde frambozen"
+                "plural_name": "freeze-dried raspberries"
             },
             "lingonberry": {
                 "aliases": [],
@@ -1640,19 +1640,19 @@
                 "aliases": [],
                 "description": "",
                 "name": "hawthorn",
-                "plural_name": "meidoorns"
+                "plural_name": "hawthorns"
             },
             "boysenberry": {
                 "aliases": [],
                 "description": "",
-                "name": "wilde braam",
+                "name": "boysenberry",
-                "plural_name": "wilde bramen"
+                "plural_name": "boysenberries"
             },
             "cloudberry": {
                 "aliases": [],
                 "description": "",
-                "name": "kruipbraam",
+                "name": "cloudberry",
-                "plural_name": "kruipbramen"
+                "plural_name": "cloudberries"
             },
             "freeze-dried berry": {
                 "aliases": [],
@@ -1715,20 +1715,20 @@
             "walnut": {
                 "aliases": [],
                 "description": "",
-                "name": "walnoot",
+                "name": "walnut",
-                "plural_name": "walnoten"
+                "plural_name": "walnuts"
             },
             "pecan": {
                 "aliases": [],
                 "description": "",
-                "name": "pecannoot",
+                "name": "pecan",
-                "plural_name": "pecannoten"
+                "plural_name": "pecans"
             },
             "almond": {
                 "aliases": [],
                 "description": "",
-                "name": "amandel",
+                "name": "almond",
-                "plural_name": "amandelen"
+                "plural_name": "almonds"
             },
             "sesame seed": {
                 "aliases": [],
@@ -1739,8 +1739,8 @@
             "cashew": {
                 "aliases": [],
                 "description": "",
-                "name": "cashewnoot",
+                "name": "cashew",
-                "plural_name": "cashewnoten"
+                "plural_name": "cashews"
             },
             "pine nut": {
                 "aliases": [],
@@ -1751,14 +1751,14 @@
             "pistachio": {
                 "aliases": [],
                 "description": "",
-                "name": "pistachenoot",
+                "name": "pistachio",
-                "plural_name": "pistachenoten"
+                "plural_name": "pistachios"
             },
             "peanut": {
                 "aliases": [],
                 "description": "",
-                "name": "pinda",
+                "name": "peanut",
-                "plural_name": "pinda's"
+                "plural_name": "peanuts"
             },
             "chia": {
                 "aliases": [],
@@ -1811,8 +1811,8 @@
             "roasted peanut": {
                 "aliases": [],
                 "description": "",
-                "name": "geroosterde pinda",
+                "name": "roasted peanut",
-                "plural_name": "geroosterde pinda's"
+                "plural_name": "roasted peanuts"
             },
             "chopped nut": {
                 "aliases": [],