Add option to space to enable plural name usage

* Add option to space to enable usage of plural name
  for food and unit per space

* Respect option per space to use the plural name
This commit is contained in:
Niklas Schwarz
2022-09-11 22:45:18 +02:00
parent 9994b6f9c2
commit b1ad5ef205
40 changed files with 193 additions and 83 deletions

View File

@ -36,7 +36,7 @@ def delete_space_action(modeladmin, request, queryset):
class SpaceAdmin(admin.ModelAdmin): class SpaceAdmin(admin.ModelAdmin):
list_display = ('name', 'created_by', 'max_recipes', 'max_users', 'max_file_storage_mb', 'allow_sharing') list_display = ('name', 'created_by', 'max_recipes', 'max_users', 'max_file_storage_mb', 'allow_sharing', 'use_plural')
search_fields = ('name', 'created_by__username') search_fields = ('name', 'created_by__username')
list_filter = ('max_recipes', 'max_users', 'max_file_storage_mb', 'allow_sharing') list_filter = ('max_recipes', 'max_users', 'max_file_storage_mb', 'allow_sharing')
date_hierarchy = 'created_at' date_hierarchy = 'created_at'

View File

@ -533,11 +533,13 @@ class SpacePreferenceForm(forms.ModelForm):
class Meta: class Meta:
model = Space model = Space
fields = ('food_inherit', 'reset_food_inherit', 'show_facet_count') fields = ('food_inherit', 'reset_food_inherit', 'show_facet_count', 'use_plural')
help_texts = { help_texts = {
'food_inherit': _('Fields on food that should be inherited by default.'), 'food_inherit': _('Fields on food that should be inherited by default.'),
'show_facet_count': _('Show recipe counts on search filters'), } 'show_facet_count': _('Show recipe counts on search filters'),
'use_plural': _('Use the plural form for units and food inside this space.'),
}
widgets = { widgets = {
'food_inherit': MultiSelectWidget 'food_inherit': MultiSelectWidget

View File

@ -31,6 +31,7 @@ class IngredientObject(object):
self.unit = bleach.clean(str(ingredient.unit)) self.unit = bleach.clean(str(ingredient.unit))
else: else:
self.unit = "" self.unit = ""
if ingredient.food:
if ingredient.food.plural_name in (None, ""): if ingredient.food.plural_name in (None, ""):
self.food = bleach.clean(str(ingredient.food)) self.food = bleach.clean(str(ingredient.food))
else: else:
@ -38,6 +39,8 @@ class IngredientObject(object):
self.food = bleach.clean(str(ingredient.food.plural_name)) self.food = bleach.clean(str(ingredient.food.plural_name))
else: else:
self.food = bleach.clean(str(ingredient.food)) self.food = bleach.clean(str(ingredient.food))
else:
self.food = ""
self.note = bleach.clean(str(ingredient.note)) self.note = bleach.clean(str(ingredient.note))
def __str__(self): def __str__(self):

View File

@ -260,6 +260,7 @@ class Space(ExportModelOperationsMixin('space'), models.Model):
max_recipes = models.IntegerField(default=0) max_recipes = models.IntegerField(default=0)
max_file_storage_mb = models.IntegerField(default=0, help_text=_('Maximum file storage for space in MB. 0 for unlimited, -1 to disable file upload.')) max_file_storage_mb = models.IntegerField(default=0, help_text=_('Maximum file storage for space in MB. 0 for unlimited, -1 to disable file upload.'))
max_users = models.IntegerField(default=0) max_users = models.IntegerField(default=0)
use_plural = models.BooleanField(default=False)
allow_sharing = models.BooleanField(default=True) allow_sharing = models.BooleanField(default=True)
demo = models.BooleanField(default=False) demo = models.BooleanField(default=False)
food_inherit = models.ManyToManyField(FoodInheritField, blank=True) food_inherit = models.ManyToManyField(FoodInheritField, blank=True)

View File

@ -277,7 +277,8 @@ class SpaceSerializer(WritableNestedModelSerializer):
class Meta: class Meta:
model = Space model = Space
fields = ('id', 'name', 'created_by', 'created_at', 'message', 'max_recipes', 'max_file_storage_mb', 'max_users', fields = ('id', 'name', 'created_by', 'created_at', 'message', 'max_recipes', 'max_file_storage_mb', 'max_users',
'allow_sharing', 'demo', 'food_inherit', 'show_facet_count', 'user_count', 'recipe_count', 'file_size_mb', 'image',) 'allow_sharing', 'demo', 'food_inherit', 'show_facet_count', 'user_count', 'recipe_count', 'file_size_mb',
'image', 'use_plural',)
read_only_fields = ('id', 'created_by', 'created_at', 'max_recipes', 'max_file_storage_mb', 'max_users', 'allow_sharing', 'demo',) read_only_fields = ('id', 'created_by', 'created_at', 'max_recipes', 'max_file_storage_mb', 'max_users', 'allow_sharing', 'demo',)

File diff suppressed because one or more lines are too long

View File

@ -48,6 +48,9 @@
<script type="text/javascript"> <script type="text/javascript">
$.fn.select2.defaults.set("theme", "bootstrap"); $.fn.select2.defaults.set("theme", "bootstrap");
{% if request.user.is_authenticated %}
window.ACTIVE_SPACE_ID = '{{request.space.id}}';
{% endif %}
</script> </script>
<!-- Fontawesome icons --> <!-- Fontawesome icons -->
@ -409,6 +412,7 @@
localStorage.setItem('STATIC_URL', "{% base_path request 'static_base' %}") localStorage.setItem('STATIC_URL', "{% base_path request 'static_base' %}")
localStorage.setItem('DEBUG', "{% is_debug %}") localStorage.setItem('DEBUG', "{% is_debug %}")
localStorage.setItem('USER_ID', "{{request.user.pk}}") localStorage.setItem('USER_ID', "{{request.user.pk}}")
window.addEventListener("load", () => { window.addEventListener("load", () => {
if ("serviceWorker" in navigator) { if ("serviceWorker" in navigator) {
navigator.serviceWorker.register("{% url 'service_worker' %}", {scope: "{% base_path request 'base' %}" + '/'}).then(function (reg) { navigator.serviceWorker.register("{% url 'service_worker' %}", {scope: "{% base_path request 'base' %}" + '/'}).then(function (reg) {

View File

@ -204,7 +204,7 @@
v-if="!import_multiple"> v-if="!import_multiple">
<recipe-card :recipe="recipe_json" :detailed="false" <recipe-card :recipe="recipe_json" :detailed="false"
:show_context_menu="false" :show_context_menu="false" :use_plural="use_plural"
></recipe-card> ></recipe-card>
</b-col> </b-col>
<b-col> <b-col>
@ -461,6 +461,7 @@ export default {
recent_urls: [], recent_urls: [],
source_data: '', source_data: '',
recipe_json: undefined, recipe_json: undefined,
use_plural: false,
// recipe_html: undefined, // recipe_html: undefined,
// recipe_tree: undefined, // recipe_tree: undefined,
recipe_images: [], recipe_images: [],
@ -490,6 +491,10 @@ export default {
this.INTEGRATIONS.forEach((int) => { this.INTEGRATIONS.forEach((int) => {
int.icon = this.getRandomFoodIcon() int.icon = this.getRandomFoodIcon()
}) })
let apiClient = new ApiApiFactory()
apiClient.retrieveSpace(window.ACTIVE_SPACE_ID).then(r => {
this.use_plural = r.data.use_plural
})
}, },
methods: { methods: {
/** /**

View File

@ -42,6 +42,7 @@
<!-- model isn't paginated and loads in one API call --> <!-- model isn't paginated and loads in one API call -->
<div v-if="!paginated"> <div v-if="!paginated">
<generic-horizontal-card v-for="i in items_left" v-bind:key="i.id" :item="i" <generic-horizontal-card v-for="i in items_left" v-bind:key="i.id" :item="i"
:use_plural="use_plural"
:model="this_model" @item-action="startAction($event, 'left')" :model="this_model" @item-action="startAction($event, 'left')"
@finish-action="finishAction"/> @finish-action="finishAction"/>
</div> </div>
@ -51,6 +52,7 @@
<template v-slot:cards> <template v-slot:cards>
<generic-horizontal-card v-for="i in items_left" v-bind:key="i.id" :item="i" <generic-horizontal-card v-for="i in items_left" v-bind:key="i.id" :item="i"
:model="this_model" :model="this_model"
:use_plural="use_plural"
@item-action="startAction($event, 'left')" @item-action="startAction($event, 'left')"
@finish-action="finishAction"/> @finish-action="finishAction"/>
</template> </template>
@ -62,6 +64,7 @@
<template v-slot:cards> <template v-slot:cards>
<generic-horizontal-card v-for="i in items_right" v-bind:key="i.id" :item="i" <generic-horizontal-card v-for="i in items_right" v-bind:key="i.id" :item="i"
:model="this_model" :model="this_model"
:use_plural="use_plural"
@item-action="startAction($event, 'right')" @item-action="startAction($event, 'right')"
@finish-action="finishAction"/> @finish-action="finishAction"/>
</template> </template>
@ -120,6 +123,7 @@ export default {
show_split: false, show_split: false,
paginated: false, paginated: false,
header_component_name: undefined, header_component_name: undefined,
use_plural: false,
} }
}, },
computed: { computed: {
@ -145,6 +149,17 @@ export default {
} }
}) })
this.$i18n.locale = window.CUSTOM_LOCALE this.$i18n.locale = window.CUSTOM_LOCALE
let apiClient = new ApiApiFactory()
apiClient.retrieveSpace(window.ACTIVE_SPACE_ID).then(r => {
this.use_plural = r.data.use_plural
if (!this.use_plural && this.this_model !== null && this.this_model.create.params[0] !== null && this.this_model.create.params[0].includes('plural_name')) {
let index = this.this_model.create.params[0].indexOf('plural_name')
if (index > -1){
this.this_model.create.params[0].splice(index, 1)
}
delete this.this_model.create.form.plural_name
}
})
}, },
methods: { methods: {
// this.genericAPI inherited from ApiMixin // this.genericAPI inherited from ApiMixin

View File

@ -572,6 +572,7 @@
{{ $t("Enable_Amount") }} {{ $t("Enable_Amount") }}
</button> </button>
<template v-if="use_plural">
<button type="button" class="dropdown-item" <button type="button" class="dropdown-item"
v-if="!ingredient.always_use_plural_unit" v-if="!ingredient.always_use_plural_unit"
@click="ingredient.always_use_plural_unit = true"> @click="ingredient.always_use_plural_unit = true">
@ -599,6 +600,8 @@
<i class="fas fa-filter fa-fw"></i> <i class="fas fa-filter fa-fw"></i>
{{ $t("Use_Plural_Food_Simple") }} {{ $t("Use_Plural_Food_Simple") }}
</button> </button>
</template>
<button type="button" class="dropdown-item" <button type="button" class="dropdown-item"
@click="copyTemplateReference(index, ingredient)"> @click="copyTemplateReference(index, ingredient)">
<i class="fas fa-code"></i> <i class="fas fa-code"></i>
@ -821,6 +824,7 @@ export default {
paste_step: undefined, paste_step: undefined,
show_file_create: false, show_file_create: false,
step_for_file_create: undefined, step_for_file_create: undefined,
use_plural: false,
additional_visible: false, additional_visible: false,
create_food: undefined, create_food: undefined,
md_editor_toolbars: { md_editor_toolbars: {
@ -868,6 +872,10 @@ export default {
this.searchRecipes("") this.searchRecipes("")
this.$i18n.locale = window.CUSTOM_LOCALE this.$i18n.locale = window.CUSTOM_LOCALE
let apiClient = new ApiApiFactory()
apiClient.retrieveSpace(window.ACTIVE_SPACE_ID).then(r => {
this.use_plural = r.data.use_plural
})
}, },
created() { created() {
window.addEventListener("keydown", this.keyboardListener) window.addEventListener("keydown", this.keyboardListener)

View File

@ -839,13 +839,16 @@
v-for="m in meal_plans" v-for="m in meal_plans"
:recipe="m.recipe" :recipe="m.recipe"
:meal_plan="m" :meal_plan="m"
:use_plural="use_plural"
:footer_text="m.meal_type_name" :footer_text="m.meal_type_name"
footer_icon="far fa-calendar-alt" footer_icon="far fa-calendar-alt"
></recipe-card> ></recipe-card>
</template> </template>
<recipe-card v-for="r in recipes" v-bind:key="r.id" :recipe="r" <recipe-card v-for="r in recipes" v-bind:key="r.id" :recipe="r"
:footer_text="isRecentOrNew(r)[0]" :footer_text="isRecentOrNew(r)[0]"
:footer_icon="isRecentOrNew(r)[1]"></recipe-card> :footer_icon="isRecentOrNew(r)[1]"
:use_plural="use_plural">
</recipe-card>
</div> </div>
</div> </div>
</div> </div>
@ -913,6 +916,7 @@ import LoadingSpinner from "@/components/LoadingSpinner" // TODO: is this deprec
import RecipeCard from "@/components/RecipeCard" import RecipeCard from "@/components/RecipeCard"
import GenericMultiselect from "@/components/GenericMultiselect" import GenericMultiselect from "@/components/GenericMultiselect"
import RecipeSwitcher from "@/components/Buttons/RecipeSwitcher" import RecipeSwitcher from "@/components/Buttons/RecipeSwitcher"
import { ApiApiFactory } from "@/utils/openapi/api"
Vue.use(VueCookies) Vue.use(VueCookies)
Vue.use(BootstrapVue) Vue.use(BootstrapVue)
@ -933,7 +937,7 @@ export default {
meal_plans: [], meal_plans: [],
last_viewed_recipes: [], last_viewed_recipes: [],
sortMenu: false, sortMenu: false,
use_plural: false,
search: { search: {
advanced_search_visible: false, advanced_search_visible: false,
explain_visible: false, explain_visible: false,
@ -1160,6 +1164,10 @@ export default {
this.loadMealPlan() this.loadMealPlan()
this.refreshData(false) this.refreshData(false)
}) })
let apiClient = new ApiApiFactory()
apiClient.retrieveSpace(window.ACTIVE_SPACE_ID).then(r => {
this.use_plural = r.data.use_plural
})
this.$i18n.locale = window.CUSTOM_LOCALE this.$i18n.locale = window.CUSTOM_LOCALE
this.debug = localStorage.getItem("DEBUG") == "True" || false this.debug = localStorage.getItem("DEBUG") == "True" || false
}, },

View File

@ -151,6 +151,9 @@
<b-form-checkbox v-model="space.show_facet_count"> Facet Count</b-form-checkbox> <b-form-checkbox v-model="space.show_facet_count"> Facet Count</b-form-checkbox>
<span class="text-muted small">{{ $t('facet_count_info') }}</span><br/> <span class="text-muted small">{{ $t('facet_count_info') }}</span><br/>
<b-form-checkbox v-model="space.use_plural">Use Plural form</b-form-checkbox>
<span class="text-muted small">{{ $t('plural_usage_info') }}</span><br/>
<label>{{ $t('FoodInherit') }}</label> <label>{{ $t('FoodInherit') }}</label>
<generic-multiselect :initial_selection="space.food_inherit" <generic-multiselect :initial_selection="space.food_inherit"
:model="Models.FOOD_INHERIT_FIELDS" :model="Models.FOOD_INHERIT_FIELDS"
@ -225,7 +228,7 @@ export default {
this.$i18n.locale = window.CUSTOM_LOCALE this.$i18n.locale = window.CUSTOM_LOCALE
let apiFactory = new ApiApiFactory() let apiFactory = new ApiApiFactory()
apiFactory.retrieveSpace(this.ACTIVE_SPACE_ID).then(r => { apiFactory.retrieveSpace(window.ACTIVE_SPACE_ID).then(r => {
this.space = r.data this.space = r.data
}) })
apiFactory.listUserSpaces().then(r => { apiFactory.listUserSpaces().then(r => {
@ -249,7 +252,7 @@ export default {
}, },
updateSpace: function () { updateSpace: function () {
let apiFactory = new ApiApiFactory() let apiFactory = new ApiApiFactory()
apiFactory.partialUpdateSpace(this.ACTIVE_SPACE_ID, this.space).then(r => { apiFactory.partialUpdateSpace(window.ACTIVE_SPACE_ID, this.space).then(r => {
StandardToasts.makeStandardToast(this, StandardToasts.SUCCESS_UPDATE) StandardToasts.makeStandardToast(this, StandardToasts.SUCCESS_UPDATE)
}).catch(err => { }).catch(err => {
StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err) StandardToasts.makeStandardToast(this, StandardToasts.FAIL_UPDATE, err)

View File

@ -12,7 +12,7 @@
<cookbook-edit-card :book="book" v-if="current_page === 1" v-on:editing="cookbook_editing = $event" v-on:refresh="$emit('refresh')" @reload="$emit('reload')"></cookbook-edit-card> <cookbook-edit-card :book="book" v-if="current_page === 1" v-on:editing="cookbook_editing = $event" v-on:refresh="$emit('refresh')" @reload="$emit('reload')"></cookbook-edit-card>
</transition> </transition>
<transition name="flip" mode="out-in"> <transition name="flip" mode="out-in">
<recipe-card :recipe="display_recipes[0].recipe_content" v-if="current_page > 1" :key="display_recipes[0].recipe"></recipe-card> <recipe-card :recipe="display_recipes[0].recipe_content" v-if="current_page > 1" :key="display_recipes[0].recipe" :use_plural="use_plural"></recipe-card>
</transition> </transition>
</div> </div>
<div class="col-md-5"> <div class="col-md-5">
@ -20,7 +20,7 @@
<cookbook-toc :recipes="recipes" v-if="current_page === 1" v-on:switchRecipe="switchRecipe($event)"></cookbook-toc> <cookbook-toc :recipes="recipes" v-if="current_page === 1" v-on:switchRecipe="switchRecipe($event)"></cookbook-toc>
</transition> </transition>
<transition name="flip" mode="out-in"> <transition name="flip" mode="out-in">
<recipe-card :recipe="display_recipes[1].recipe_content" v-if="current_page > 1 && display_recipes.length === 2" :key="display_recipes[1].recipe"></recipe-card> <recipe-card :recipe="display_recipes[1].recipe_content" v-if="current_page > 1 && display_recipes.length === 2" :key="display_recipes[1].recipe" :use_plural="use_plural"></recipe-card>
</transition> </transition>
</div> </div>
<div class="col-md-1" @click="swipeLeft" style="cursor: pointer"></div> <div class="col-md-1" @click="swipeLeft" style="cursor: pointer"></div>
@ -34,7 +34,7 @@ import CookbookEditCard from "./CookbookEditCard"
import CookbookToc from "./CookbookToc" import CookbookToc from "./CookbookToc"
import Vue2TouchEvents from "vue2-touch-events" import Vue2TouchEvents from "vue2-touch-events"
import Vue from "vue" import Vue from "vue"
import { ApiApiFactory } from "../utils/openapi/api" import { ApiApiFactory } from "@/utils/openapi/api"
Vue.use(Vue2TouchEvents) Vue.use(Vue2TouchEvents)
@ -56,6 +56,12 @@ export default {
return this.recipes.slice((this.current_page - 1 - 1) * 2, (this.current_page - 1) * 2) return this.recipes.slice((this.current_page - 1 - 1) * 2, (this.current_page - 1) * 2)
} }
}, },
mounted(){
let apiClient = new ApiApiFactory()
apiClient.retrieveSpace(window.ACTIVE_SPACE_ID).then(r => {
this.use_plural = r.data.use_plural
})
},
data() { data() {
return { return {
current_page: 1, current_page: 1,
@ -63,6 +69,7 @@ export default {
bounce_left: false, bounce_left: false,
bounce_right: false, bounce_right: false,
cookbook_editing: false, cookbook_editing: false,
use_plural: false,
} }
}, },
methods: { methods: {

View File

@ -23,7 +23,9 @@
<b-card-body class="m-0 py-0"> <b-card-body class="m-0 py-0">
<b-card-text class="h-100 my-0 d-flex flex-column" style="text-overflow: ellipsis"> <b-card-text class="h-100 my-0 d-flex flex-column" style="text-overflow: ellipsis">
<h5 class="m-0 mt-1 text-truncate">{{ item[title] }}</h5> <h5 class="m-0 mt-1 text-truncate">{{ item[title] }}</h5>
<template v-if="use_plural">
<div v-if="item[plural] !== '' && item[plural] !== null" class="m-0 text-truncate">({{ $t("plural_short") }}: {{ item[plural] }})</div> <div v-if="item[plural] !== '' && item[plural] !== null" class="m-0 text-truncate">({{ $t("plural_short") }}: {{ item[plural] }})</div>
</template>
<div class="m-0 text-truncate">{{ item[subtitle] }}</div> <div class="m-0 text-truncate">{{ item[subtitle] }}</div>
<div class="m-0 text-truncate small text-muted" v-if="getFullname">{{ getFullname }}</div> <div class="m-0 text-truncate small text-muted" v-if="getFullname">{{ getFullname }}</div>
@ -72,7 +74,11 @@
<!-- recursively add child cards --> <!-- recursively add child cards -->
<div class="row" v-if="item.show_children"> <div class="row" v-if="item.show_children">
<div class="col-md-10 offset-md-2"> <div class="col-md-10 offset-md-2">
<generic-horizontal-card v-for="child in item[children]" v-bind:key="child.id" :item="child" :model="model" @item-action="$emit('item-action', $event)"> </generic-horizontal-card> <generic-horizontal-card v-for="child in item[children]"
v-bind:key="child.id"
:item="child" :model="model"
:use_plural="use_plural"
@item-action="$emit('item-action', $event)"></generic-horizontal-card>
</div> </div>
</div> </div>
<!-- conditionally view recipes --> <!-- conditionally view recipes -->
@ -154,6 +160,7 @@ export default {
recipe_count: { type: String, default: "numrecipe" }, recipe_count: { type: String, default: "numrecipe" },
recipes: { type: String, default: "recipes" }, recipes: { type: String, default: "recipes" },
show_context_menu: { type: Boolean, default: true }, show_context_menu: { type: Boolean, default: true },
use_plural: { type: Boolean, default: false},
}, },
data() { data() {
return { return {

View File

@ -17,6 +17,10 @@
</td> </td>
<td @click="done"> <td @click="done">
<template v-if="ingredient.unit !== null && !ingredient.no_amount"> <template v-if="ingredient.unit !== null && !ingredient.no_amount">
<template v-if="!use_plural">
<span>{{ ingredient.unit.name }}
</template>
<template v-else>
<template v-if="ingredient.unit.plural_name === '' || ingredient.unit.plural_name === null"> <template v-if="ingredient.unit.plural_name === '' || ingredient.unit.plural_name === null">
<span>{{ ingredient.unit.name }} <span>{{ ingredient.unit.name }}
</template> </template>
@ -26,6 +30,7 @@
<span v-else>{{ ingredient.unit.name }}</span> <span v-else>{{ ingredient.unit.name }}</span>
</template> </template>
</template> </template>
</template>
</td> </td>
<td @click="done"> <td @click="done">
<template v-if="ingredient.food !== null"> <template v-if="ingredient.food !== null">
@ -33,6 +38,10 @@
v-if="ingredient.food.recipe !== null" target="_blank" v-if="ingredient.food.recipe !== null" target="_blank"
rel="noopener noreferrer">{{ ingredient.food.name }}</a> rel="noopener noreferrer">{{ ingredient.food.name }}</a>
<template v-if="ingredient.food.recipe === null"> <template v-if="ingredient.food.recipe === null">
<template v-if="!use_plural">
<span>{{ ingredient.food.name }}</span>
</template>
<template v-else>
<template v-if="ingredient.food.plural_name === '' || ingredient.food.plural_name === null"> <template v-if="ingredient.food.plural_name === '' || ingredient.food.plural_name === null">
<span>{{ ingredient.food.name }}</span> <span>{{ ingredient.food.name }}</span>
</template> </template>
@ -44,6 +53,7 @@
</template> </template>
</template> </template>
</template> </template>
</template>
</td> </td>
<td v-if="detailed"> <td v-if="detailed">
<div v-if="ingredient.note"> <div v-if="ingredient.note">
@ -74,6 +84,7 @@ export default {
props: { props: {
ingredient: Object, ingredient: Object,
ingredient_factor: {type: Number, default: 1}, ingredient_factor: {type: Number, default: 1},
use_plural:{type: Boolean, default: false},
detailed: {type: Boolean, default: true}, detailed: {type: Boolean, default: true},
}, },
mixins: [ResolveUrlMixin], mixins: [ResolveUrlMixin],

View File

@ -24,6 +24,7 @@
<ingredient-component <ingredient-component
:ingredient="i" :ingredient="i"
:ingredient_factor="ingredient_factor" :ingredient_factor="ingredient_factor"
:use_plural="use_plural"
:key="i.id" :key="i.id"
:detailed="detailed" :detailed="detailed"
@checked-state-changed="$emit('checked-state-changed', $event)" @checked-state-changed="$emit('checked-state-changed', $event)"
@ -63,6 +64,7 @@ export default {
recipe: {type: Number}, recipe: {type: Number},
ingredient_factor: {type: Number, default: 1}, ingredient_factor: {type: Number, default: 1},
servings: {type: Number, default: 1}, servings: {type: Number, default: 1},
use_plural: {type: Boolean, default: false},
detailed: {type: Boolean, default: true}, detailed: {type: Boolean, default: true},
header: {type: Boolean, default: false}, header: {type: Boolean, default: false},
recipe_list: {type: Number, default: undefined}, recipe_list: {type: Number, default: undefined},

View File

@ -84,7 +84,7 @@
</b-input-group> </b-input-group>
</div> </div>
<div class="col-lg-6 d-none d-lg-block d-xl-block"> <div class="col-lg-6 d-none d-lg-block d-xl-block">
<recipe-card v-if="entryEditing.recipe" :recipe="entryEditing.recipe" :detailed="false"></recipe-card> <recipe-card v-if="entryEditing.recipe" :recipe="entryEditing.recipe" :detailed="false" :use_plural="use_plural"></recipe-card>
</div> </div>
</div> </div>
<div class="row mt-3 mb-3"> <div class="row mt-3 mb-3">
@ -144,6 +144,7 @@ export default {
addshopping: false, addshopping: false,
reviewshopping: false, reviewshopping: false,
}, },
use_plural: false,
} }
}, },
watch: { watch: {
@ -171,7 +172,12 @@ export default {
this.entryEditing.servings = newVal this.entryEditing.servings = newVal
}, },
}, },
mounted: function () {}, mounted: function () {
let apiClient = new ApiApiFactory()
apiClient.retrieveSpace(window.ACTIVE_SPACE_ID).then(r => {
this.use_plural = r.data.use_plural
})
},
computed: { computed: {
autoMealPlan: function () { autoMealPlan: function () {
return getUserPreference("mealplan_autoadd_shopping") return getUserPreference("mealplan_autoadd_shopping")

View File

@ -75,8 +75,12 @@
<h6 class="card-title"><i class="fas fa-pepper-hot"></i> {{ $t("Ingredients") }} <h6 class="card-title"><i class="fas fa-pepper-hot"></i> {{ $t("Ingredients") }}
</h6> </h6>
<ingredients-card :steps="recipe.steps" :header="false" :detailed="false" <ingredients-card
:servings="recipe.servings"/> :steps="recipe.steps"
:header="false"
:detailed="false"
:servings="recipe.servings"
:use_plural="use_plural" />
</div> </div>
</div> </div>
</transition> </transition>
@ -121,6 +125,7 @@ export default {
props: { props: {
recipe: Object, recipe: Object,
meal_plan: Object, meal_plan: Object,
use_plural: { type: Boolean, default: false},
footer_text: String, footer_text: String,
footer_icon: String, footer_icon: String,
detailed: {type: Boolean, default: true}, detailed: {type: Boolean, default: true},

View File

@ -431,5 +431,6 @@
"Use_Plural_Unit_Always": "", "Use_Plural_Unit_Always": "",
"Use_Plural_Unit_Simple": "", "Use_Plural_Unit_Simple": "",
"Use_Plural_Food_Always": "", "Use_Plural_Food_Always": "",
"Use_Plural_Food_Simple": "" "Use_Plural_Food_Simple": "",
"plural_usage_info": ""
} }

View File

@ -416,5 +416,6 @@
"Use_Plural_Unit_Always": "", "Use_Plural_Unit_Always": "",
"Use_Plural_Unit_Simple": "", "Use_Plural_Unit_Simple": "",
"Use_Plural_Food_Always": "", "Use_Plural_Food_Always": "",
"Use_Plural_Food_Simple": "" "Use_Plural_Food_Simple": "",
"plural_usage_info": ""
} }

View File

@ -464,5 +464,6 @@
"Use_Plural_Unit_Always": "", "Use_Plural_Unit_Always": "",
"Use_Plural_Unit_Simple": "", "Use_Plural_Unit_Simple": "",
"Use_Plural_Food_Always": "", "Use_Plural_Food_Always": "",
"Use_Plural_Food_Simple": "" "Use_Plural_Food_Simple": "",
"plural_usage_info": ""
} }

View File

@ -466,5 +466,6 @@
"Use_Plural_Unit_Always": "Pluralform der Maßeinheit immer verwenden", "Use_Plural_Unit_Always": "Pluralform der Maßeinheit immer verwenden",
"Use_Plural_Unit_Simple": "Pluralform der Maßeinheit dynamisch anpassen", "Use_Plural_Unit_Simple": "Pluralform der Maßeinheit dynamisch anpassen",
"Use_Plural_Food_Always": "Pluralform des Essens immer verwenden", "Use_Plural_Food_Always": "Pluralform des Essens immer verwenden",
"Use_Plural_Food_Simple": "Pluralform des Essens dynamisch anpassen" "Use_Plural_Food_Simple": "Pluralform des Essens dynamisch anpassen",
"plural_usage_info": "Pluralform für Einheiten und Essen in diesem Space verwenden."
} }

View File

@ -465,5 +465,6 @@
"Use_Plural_Unit_Always": "Use plural form for unit always", "Use_Plural_Unit_Always": "Use plural form for unit always",
"Use_Plural_Unit_Simple": "Use plural form for unit dynamically", "Use_Plural_Unit_Simple": "Use plural form for unit dynamically",
"Use_Plural_Food_Always": "Use plural form for food always", "Use_Plural_Food_Always": "Use plural form for food always",
"Use_Plural_Food_Simple": "Use plural form for food dynamically" "Use_Plural_Food_Simple": "Use plural form for food dynamically",
"plural_usage_info": "Use the plural form for units and food inside this space."
} }

View File

@ -442,5 +442,6 @@
"Use_Plural_Unit_Always": "", "Use_Plural_Unit_Always": "",
"Use_Plural_Unit_Simple": "", "Use_Plural_Unit_Simple": "",
"Use_Plural_Food_Always": "", "Use_Plural_Food_Always": "",
"Use_Plural_Food_Simple": "" "Use_Plural_Food_Simple": "",
"plural_usage_info": ""
} }

View File

@ -218,5 +218,6 @@
"Use_Plural_Unit_Always": "", "Use_Plural_Unit_Always": "",
"Use_Plural_Unit_Simple": "", "Use_Plural_Unit_Simple": "",
"Use_Plural_Food_Always": "", "Use_Plural_Food_Always": "",
"Use_Plural_Food_Simple": "" "Use_Plural_Food_Simple": "",
"plural_usage_info": ""
} }

View File

@ -408,5 +408,6 @@
"Use_Plural_Unit_Always": "", "Use_Plural_Unit_Always": "",
"Use_Plural_Unit_Simple": "", "Use_Plural_Unit_Simple": "",
"Use_Plural_Food_Always": "", "Use_Plural_Food_Always": "",
"Use_Plural_Food_Simple": "" "Use_Plural_Food_Simple": "",
"plural_usage_info": ""
} }

View File

@ -418,5 +418,6 @@
"Use_Plural_Unit_Always": "", "Use_Plural_Unit_Always": "",
"Use_Plural_Unit_Simple": "", "Use_Plural_Unit_Simple": "",
"Use_Plural_Food_Always": "", "Use_Plural_Food_Always": "",
"Use_Plural_Food_Simple": "" "Use_Plural_Food_Simple": "",
"plural_usage_info": ""
} }

View File

@ -128,5 +128,6 @@
"Use_Plural_Unit_Always": "", "Use_Plural_Unit_Always": "",
"Use_Plural_Unit_Simple": "", "Use_Plural_Unit_Simple": "",
"Use_Plural_Food_Always": "", "Use_Plural_Food_Always": "",
"Use_Plural_Food_Simple": "" "Use_Plural_Food_Simple": "",
"plural_usage_info": ""
} }

View File

@ -352,5 +352,6 @@
"Use_Plural_Unit_Always": "", "Use_Plural_Unit_Always": "",
"Use_Plural_Unit_Simple": "", "Use_Plural_Unit_Simple": "",
"Use_Plural_Food_Always": "", "Use_Plural_Food_Always": "",
"Use_Plural_Food_Simple": "" "Use_Plural_Food_Simple": "",
"plural_usage_info": ""
} }

View File

@ -467,5 +467,6 @@
"Use_Plural_Unit_Always": "", "Use_Plural_Unit_Always": "",
"Use_Plural_Unit_Simple": "", "Use_Plural_Unit_Simple": "",
"Use_Plural_Food_Always": "", "Use_Plural_Food_Always": "",
"Use_Plural_Food_Simple": "" "Use_Plural_Food_Simple": "",
"plural_usage_info": ""
} }

View File

@ -466,5 +466,6 @@
"Use_Plural_Unit_Always": "", "Use_Plural_Unit_Always": "",
"Use_Plural_Unit_Simple": "", "Use_Plural_Unit_Simple": "",
"Use_Plural_Food_Always": "", "Use_Plural_Food_Always": "",
"Use_Plural_Food_Simple": "" "Use_Plural_Food_Simple": "",
"plural_usage_info": ""
} }

View File

@ -388,5 +388,6 @@
"Use_Plural_Unit_Always": "", "Use_Plural_Unit_Always": "",
"Use_Plural_Unit_Simple": "", "Use_Plural_Unit_Simple": "",
"Use_Plural_Food_Always": "", "Use_Plural_Food_Always": "",
"Use_Plural_Food_Simple": "" "Use_Plural_Food_Simple": "",
"plural_usage_info": ""
} }

View File

@ -393,5 +393,6 @@
"Use_Plural_Unit_Always": "", "Use_Plural_Unit_Always": "",
"Use_Plural_Unit_Simple": "", "Use_Plural_Unit_Simple": "",
"Use_Plural_Food_Always": "", "Use_Plural_Food_Always": "",
"Use_Plural_Food_Simple": "" "Use_Plural_Food_Simple": "",
"plural_usage_info": ""
} }

View File

@ -212,5 +212,6 @@
"Use_Plural_Unit_Always": "", "Use_Plural_Unit_Always": "",
"Use_Plural_Unit_Simple": "", "Use_Plural_Unit_Simple": "",
"Use_Plural_Food_Always": "", "Use_Plural_Food_Always": "",
"Use_Plural_Food_Simple": "" "Use_Plural_Food_Simple": "",
"plural_usage_info": ""
} }

View File

@ -348,5 +348,6 @@
"Use_Plural_Unit_Always": "", "Use_Plural_Unit_Always": "",
"Use_Plural_Unit_Simple": "", "Use_Plural_Unit_Simple": "",
"Use_Plural_Food_Always": "", "Use_Plural_Food_Always": "",
"Use_Plural_Food_Simple": "" "Use_Plural_Food_Simple": "",
"plural_usage_info": ""
} }

View File

@ -290,5 +290,6 @@
"Use_Plural_Unit_Always": "", "Use_Plural_Unit_Always": "",
"Use_Plural_Unit_Simple": "", "Use_Plural_Unit_Simple": "",
"Use_Plural_Food_Always": "", "Use_Plural_Food_Always": "",
"Use_Plural_Food_Simple": "" "Use_Plural_Food_Simple": "",
"plural_usage_info": ""
} }

View File

@ -386,5 +386,6 @@
"Use_Plural_Unit_Always": "", "Use_Plural_Unit_Always": "",
"Use_Plural_Unit_Simple": "", "Use_Plural_Unit_Simple": "",
"Use_Plural_Food_Always": "", "Use_Plural_Food_Always": "",
"Use_Plural_Food_Simple": "" "Use_Plural_Food_Simple": "",
"plural_usage_info": ""
} }

View File

@ -418,5 +418,6 @@
"Use_Plural_Unit_Always": "", "Use_Plural_Unit_Always": "",
"Use_Plural_Unit_Simple": "", "Use_Plural_Unit_Simple": "",
"Use_Plural_Food_Always": "", "Use_Plural_Food_Always": "",
"Use_Plural_Food_Simple": "" "Use_Plural_Food_Simple": "",
"plural_usage_info": ""
} }

View File

@ -465,5 +465,6 @@
"Use_Plural_Unit_Always": "", "Use_Plural_Unit_Always": "",
"Use_Plural_Unit_Simple": "", "Use_Plural_Unit_Simple": "",
"Use_Plural_Food_Always": "", "Use_Plural_Food_Always": "",
"Use_Plural_Food_Simple": "" "Use_Plural_Food_Simple": "",
"plural_usage_info": ""
} }

View File

@ -83,5 +83,6 @@
"Use_Plural_Unit_Always": "", "Use_Plural_Unit_Always": "",
"Use_Plural_Unit_Simple": "", "Use_Plural_Unit_Simple": "",
"Use_Plural_Food_Always": "", "Use_Plural_Food_Always": "",
"Use_Plural_Food_Simple": "" "Use_Plural_Food_Simple": "",
"plural_usage_info": ""
} }