kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 17:45:39 +00:00
Code Issues Projects Releases Wiki Activity

Little changes, changelog and added missing localization strings for #555

Browse Source
This commit is contained in:
Bernd Bestel 2020-02-09 21:16:47 +01:00
parent 7be2d94cf7
commit 472c083bca
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/56_UNRELEASED_2020-xx-xx.md
View File

@ -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) - 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 - 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 - 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 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 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 - Fixed that the recipe "fullscreen card" was not correctly displayed

6
localization/strings.pot
View File

@ -1729,3 +1729,9 @@ msgstr ""
msgid "Edit recipe on %s" msgid "Edit recipe on %s"
msgstr "" msgstr ""
msgid "Desired servings"
msgstr ""
msgid "Base: %s"
msgstr ""

6
views/recipes.blade.php
View File

@ -53,7 +53,7 @@
<thead> <thead>
<tr> <tr>
<th>{{ $__t('Name') }}</th> <th>{{ $__t('Name') }}</th>
<th>{{ $__t('Desired Servings') }}</th> <th>{{ $__t('Desired servings') }}</th>
<th>{{ $__t('Requirements fulfilled') }}</th> <th>{{ $__t('Requirements fulfilled') }}</th>
<th class="d-none">Hidden status for sorting of "Requirements fulfilled" column</th> <th class="d-none">Hidden status for sorting of "Requirements fulfilled" column</th>
<th class="d-none">Hidden status for filtering by status</th> <th class="d-none">Hidden status for filtering by status</th>
@ -155,12 +155,12 @@
<div class="col-4"> <div class="col-4">
@include('components.numberpicker', array( @include('components.numberpicker', array(
'id' => 'servings-scale', 'id' => 'servings-scale',
'label' => 'Desired Servings', 'label' => 'Desired servings',
'min' => 1, 'min' => 1,
'value' => $selectedRecipe->desired_servings, 'value' => $selectedRecipe->desired_servings,
'invalidFeedback' => $__t('This cannot be lower than %s', '1'), 'invalidFeedback' => $__t('This cannot be lower than %s', '1'),
'additionalAttributes' => 'data-recipe-id="' . $selectedRecipe->id . '"', 'additionalAttributes' => 'data-recipe-id="' . $selectedRecipe->id . '"',
'hint' => $__t('Initial Base Servings:%s', $selectedRecipe->base_servings) 'hint' => $__t('Base: %s', $selectedRecipe->base_servings)
)) ))
</div> </div>
@if(!empty($selectedRecipeTotalCalories) && intval($selectedRecipeTotalCalories) > 0) @if(!empty($selectedRecipeTotalCalories) && intval($selectedRecipeTotalCalories) > 0)