diff --git a/changelog/56_UNRELEASED_2020-xx-xx.md b/changelog/56_UNRELEASED_2020-xx-xx.md index 654fe8c2..9d3687e0 100644 --- a/changelog/56_UNRELEASED_2020-xx-xx.md +++ b/changelog/56_UNRELEASED_2020-xx-xx.md @@ -11,6 +11,7 @@ - Optimized the ordering of the inputs on the recipe ingredient edit page (moved "Only check if a single unit is in stock" before the amount) - Variable ingredient amounts are now marked accordingly on the renedered recipe - After selecting a recipe on mobile devices, the page now automatically scrolls to the recipe card +- Added the recipes base servings to be displayed on the recipe card and properly named the servings column in the recipes list/table (thanks @kriddles) - Fixed that when editing a recipe ingredient which had "Only check if a single unit is in stock" set, not any quantity unit could be picked and the amount stayed empty - Fixed that when reloading the "new recipe"-page (or when it gets auto-reloaded due to "Auto reload on external changes" is enabled), for each reload a new recipe was created - Fixed that the recipe "fullscreen card" was not correctly displayed diff --git a/localization/strings.pot b/localization/strings.pot index 98b5f89f..d227d5ac 100644 --- a/localization/strings.pot +++ b/localization/strings.pot @@ -1729,3 +1729,9 @@ msgstr "" msgid "Edit recipe on %s" msgstr "" + +msgid "Desired servings" +msgstr "" + +msgid "Base: %s" +msgstr "" diff --git a/views/recipes.blade.php b/views/recipes.blade.php index ba8c81d4..95871ab2 100644 --- a/views/recipes.blade.php +++ b/views/recipes.blade.php @@ -53,7 +53,7 @@ {{ $__t('Name') }} - {{ $__t('Desired Servings') }} + {{ $__t('Desired servings') }} {{ $__t('Requirements fulfilled') }} Hidden status for sorting of "Requirements fulfilled" column Hidden status for filtering by status @@ -155,12 +155,12 @@
@include('components.numberpicker', array( 'id' => 'servings-scale', - 'label' => 'Desired Servings', + 'label' => 'Desired servings', 'min' => 1, 'value' => $selectedRecipe->desired_servings, 'invalidFeedback' => $__t('This cannot be lower than %s', '1'), 'additionalAttributes' => 'data-recipe-id="' . $selectedRecipe->id . '"', - 'hint' => $__t('Initial Base Servings:%s', $selectedRecipe->base_servings) + 'hint' => $__t('Base: %s', $selectedRecipe->base_servings) ))
@if(!empty($selectedRecipeTotalCalories) && intval($selectedRecipeTotalCalories) > 0)