diff --git a/frontend/lib/api/types/non-generated.ts b/frontend/lib/api/types/non-generated.ts index 3970f1859..752236b1f 100644 --- a/frontend/lib/api/types/non-generated.ts +++ b/frontend/lib/api/types/non-generated.ts @@ -60,7 +60,7 @@ export interface QueryFilterJSONPart { } export type StandardizedUnitType - = | "fluid ounce" + = | "fluid_ounce" | "cup" | "ounce" | "pound" diff --git a/frontend/pages/group/data/units.vue b/frontend/pages/group/data/units.vue index 08abeed49..635d936d8 100644 --- a/frontend/pages/group/data/units.vue +++ b/frontend/pages/group/data/units.vue @@ -459,7 +459,7 @@ export default defineNuxtComponent({ const standardUnitItems = computed(() => [ { title: i18n.t("data-pages.units.standard-unit-labels.fluid-ounce"), - value: "fluid ounce", + value: "fluid_ounce", }, { title: i18n.t("data-pages.units.standard-unit-labels.cup"), diff --git a/mealie/schema/recipe/recipe_ingredient.py b/mealie/schema/recipe/recipe_ingredient.py index 06c95bfb1..64d7da513 100644 --- a/mealie/schema/recipe/recipe_ingredient.py +++ b/mealie/schema/recipe/recipe_ingredient.py @@ -43,7 +43,7 @@ class StandardizedUnitType(StrEnum): """ # Imperial - FLUID_OUNCE = "fluid ounce" + FLUID_OUNCE = "fluid_ounce" CUP = "cup" OUNCE = "ounce" diff --git a/mealie/services/parser_services/parser_utils/unit_utils.py b/mealie/services/parser_services/parser_utils/unit_utils.py index 30fa1d85d..ef73e7e29 100644 --- a/mealie/services/parser_services/parser_utils/unit_utils.py +++ b/mealie/services/parser_services/parser_utils/unit_utils.py @@ -121,7 +121,7 @@ def merge_quantity_and_unit[T: CreateIngredientUnit]( uc = UnitConverter() - # pre-process units to account for ounce -> fluid ounce conversion + # pre-process units to account for ounce -> fluid_ounce conversion unit_1_standard = uc.parse(unit_1.standard_unit, strict=True) unit_2_standard = uc.parse(unit_2.standard_unit, strict=True) unit_1_standard, unit_2_standard = uc._resolve_ounce(unit_1_standard, unit_2_standard)