1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-08-04 21:15:22 +02:00

fix: Missing Yield Text (#5827)

This commit is contained in:
Michael Genson 2025-07-29 15:33:44 -05:00 committed by GitHub
parent 3b74ddd9ad
commit d6d247f1f8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 19 additions and 10 deletions

View file

@ -35,7 +35,7 @@
>
<RecipeYield
:yield-quantity="recipe.recipeYieldQuantity"
:yield="recipe.recipeYield"
:yield-text="recipe.recipeYield"
:scale="recipeScale"
class="mb-4"
/>

View file

@ -222,7 +222,7 @@ export default defineNuxtComponent({
const servingsDisplay = computed(() => {
const { scaledAmountDisplay } = useScaledAmount(props.recipe.recipeYieldQuantity, props.scale);
return scaledAmountDisplay
return scaledAmountDisplay || props.recipe.recipeYield
? i18n.t("recipe.yields-amount-with-text", {
amount: scaledAmountDisplay,
text: props.recipe.recipeYield,

View file

@ -1,6 +1,6 @@
<template>
<div
v-if="scaledAmount"
v-if="yieldDisplay"
class="d-flex align-center"
>
<v-row
@ -18,7 +18,7 @@
<p class="my-0 opacity-80">
<span class="font-weight-bold">{{ $t("recipe.yield") }}</span><br>
<!-- eslint-disable-next-line vue/no-v-html -->
<span v-html="scaledAmount" /> {{ text }}
<span v-html="yieldDisplay" />
</p>
</v-row>
</div>
@ -34,7 +34,7 @@ export default defineNuxtComponent({
type: Number,
default: 0,
},
yield: {
yieldText: {
type: String,
default: "",
},
@ -55,15 +55,24 @@ export default defineNuxtComponent({
});
}
const scaledAmount = computed(() => {
const yieldDisplay = computed<string>(() => {
const components: string[] = [];
const { scaledAmountDisplay } = useScaledAmount(props.yieldQuantity, props.scale);
return scaledAmountDisplay;
if (scaledAmountDisplay) {
components.push(scaledAmountDisplay);
}
const text = props.yieldText;
if (text) {
components.push(text);
}
return sanitizeHTML(components.join(" "));
});
const text = sanitizeHTML(props.yield);
return {
scaledAmount,
text,
yieldDisplay,
};
},
});