Mirrors/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2026-02-24 16:53:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix fluid ounce -> fluid_ounce

Browse Source
This commit is contained in:
Michael Genson
2026-02-22 22:25:15 +00:00
parent 89b1629d68
commit eebff3f481
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/lib/api/types/non-generated.ts
View File

@@ -60,7 +60,7 @@ export interface QueryFilterJSONPart {
} }
export type StandardizedUnitType export type StandardizedUnitType
= | "fluid ounce" = | "fluid_ounce"
| "cup" | "cup"
| "ounce" | "ounce"
| "pound" | "pound"

2
frontend/pages/group/data/units.vue
View File

@@ -459,7 +459,7 @@ export default defineNuxtComponent({
const standardUnitItems = computed<StandardUnitItem[]>(() => [ const standardUnitItems = computed<StandardUnitItem[]>(() => [
{ {
title: i18n.t("data-pages.units.standard-unit-labels.fluid-ounce"), 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"), title: i18n.t("data-pages.units.standard-unit-labels.cup"),

2
mealie/schema/recipe/recipe_ingredient.py
View File

@@ -43,7 +43,7 @@ class StandardizedUnitType(StrEnum):
""" """
# Imperial # Imperial
FLUID_OUNCE = "fluid ounce" FLUID_OUNCE = "fluid_ounce"
CUP = "cup" CUP = "cup"
OUNCE = "ounce" OUNCE = "ounce"

2
mealie/services/parser_services/parser_utils/unit_utils.py
View File

@@ -121,7 +121,7 @@ def merge_quantity_and_unit[T: CreateIngredientUnit](
uc = UnitConverter() 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_1_standard = uc.parse(unit_1.standard_unit, strict=True)
unit_2_standard = uc.parse(unit_2.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) unit_1_standard, unit_2_standard = uc._resolve_ounce(unit_1_standard, unit_2_standard)