Name shopping locations "Stores" on the frontend (references #658)

This commit is contained in:
Bernd Bestel 2020-03-25 20:09:28 +01:00
parent 5214a775ed
commit 305f5b67e4
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
9 changed files with 21 additions and 21 deletions

View File

@ -1175,7 +1175,7 @@
"shopping_location_id": { "shopping_location_id": {
"type": "number", "type": "number",
"format": "integer", "format": "integer",
"description": "If omitted, no shopping location will be affected" "description": "If omitted, no store will be affected"
}, },
"purchased_date": { "purchased_date": {
"type": "string", "type": "string",
@ -1487,7 +1487,7 @@
"shopping_location_id": { "shopping_location_id": {
"type": "number", "type": "number",
"format": "integer", "format": "integer",
"description": "If omitted, no shopping location will be affected" "description": "If omitted, no store will be affected"
} }
}, },
"example": { "example": {
@ -1719,7 +1719,7 @@
"shopping_location_id": { "shopping_location_id": {
"type": "number", "type": "number",
"format": "integer", "format": "integer",
"description": "If omitted, no shopping location will be affected" "description": "If omitted, no store will be affected"
}, },
"location_id": { "location_id": {
"type": "number", "type": "number",

View File

@ -79,7 +79,7 @@ msgstr ""
msgid "Locations" msgid "Locations"
msgstr "" msgstr ""
msgid "Shopping locations" msgid "Stores"
msgstr "" msgstr ""
msgid "Quantity units" msgid "Quantity units"
@ -178,9 +178,6 @@ msgstr ""
msgid "Location" msgid "Location"
msgstr "" msgstr ""
msgid "Shopping location"
msgstr ""
msgid "Min. stock amount" msgid "Min. stock amount"
msgstr "" msgstr ""
@ -220,7 +217,7 @@ msgstr ""
msgid "Create location" msgid "Create location"
msgstr "" msgstr ""
msgid "Create shopping location" msgid "Create store"
msgstr "" msgstr ""
msgid "Create quantity unit" msgid "Create quantity unit"
@ -256,7 +253,7 @@ msgstr ""
msgid "Edit location" msgid "Edit location"
msgstr "" msgstr ""
msgid "Edit shopping location" msgid "Edit store"
msgstr "" msgstr ""
msgid "Record data" msgid "Record data"
@ -331,7 +328,7 @@ msgstr ""
msgid "Are you sure to delete location \"%s\"?" msgid "Are you sure to delete location \"%s\"?"
msgstr "" msgstr ""
msgid "Are you sure to delete shopping location \"%s\"?" msgid "Are you sure to delete store \"%s\"?"
msgstr "" msgstr ""
msgid "Manage API keys" msgid "Manage API keys"
@ -1037,7 +1034,7 @@ msgstr ""
msgid "You have to select a location" msgid "You have to select a location"
msgstr "" msgstr ""
msgid "You have to select a shopping location" msgid "You have to select a store"
msgstr "" msgstr ""
msgid "List" msgid "List"
@ -1763,5 +1760,8 @@ msgstr ""
msgid "Group ingredients by their product group" msgid "Group ingredients by their product group"
msgstr "" msgstr ""
msgid "Unknown shopping location" msgid "Unknown store"
msgstr ""
msgid "Store"
msgstr "" msgstr ""

View File

@ -122,7 +122,7 @@ Grocy.Components.ProductCard.Refresh = function(productId)
var chart = Grocy.Components.ProductCard.PriceHistoryChart.data; var chart = Grocy.Components.ProductCard.PriceHistoryChart.data;
priceHistoryDataPoints.forEach((dataPoint) => priceHistoryDataPoints.forEach((dataPoint) =>
{ {
var key = __t("Unknown shopping location"); var key = __t("Unknown store");
if (dataPoint.shopping_location) if (dataPoint.shopping_location)
{ {
key = dataPoint.shopping_location.name key = dataPoint.shopping_location.name

View File

@ -25,7 +25,7 @@ $(document).on('click', '.shoppinglocation-delete-button', function (e)
var objectId = $(e.currentTarget).attr('data-shoppinglocation-id'); var objectId = $(e.currentTarget).attr('data-shoppinglocation-id');
bootbox.confirm({ bootbox.confirm({
message: __t('Are you sure to delete shopping location "%s"?', objectName), message: __t('Are you sure to delete store "%s"?', objectName),
closeButton: false, closeButton: false,
buttons: { buttons: {
confirm: { confirm: {

View File

@ -9,12 +9,12 @@
@php if(empty($nextInputSelector)) { $nextInputSelector = ''; } @endphp @php if(empty($nextInputSelector)) { $nextInputSelector = ''; } @endphp
<div class="form-group" data-next-input-selector="{{ $nextInputSelector }}" data-prefill-by-name="{{ $prefillByName }}" data-prefill-by-id="{{ $prefillById }}"> <div class="form-group" data-next-input-selector="{{ $nextInputSelector }}" data-prefill-by-name="{{ $prefillByName }}" data-prefill-by-id="{{ $prefillById }}">
<label for="shopping_location_id">{{ $__t('Shopping location') }}&nbsp;&nbsp;<span id="{{ $hintId }}" class="small text-muted">{{ $hint }}</span></label> <label for="shopping_location_id">{{ $__t('Store') }}&nbsp;&nbsp;<span id="{{ $hintId }}" class="small text-muted">{{ $hint }}</span></label>
<select class="form-control shopping-location-combobox" id="shopping_location_id" name="shopping_location_id" @if($isRequired) required @endif> <select class="form-control shopping-location-combobox" id="shopping_location_id" name="shopping_location_id" @if($isRequired) required @endif>
<option value=""></option> <option value=""></option>
@foreach($shoppinglocations as $shoppinglocation) @foreach($shoppinglocations as $shoppinglocation)
<option value="{{ $shoppinglocation->id }}">{{ $shoppinglocation->name }}</option> <option value="{{ $shoppinglocation->id }}">{{ $shoppinglocation->name }}</option>
@endforeach @endforeach
</select> </select>
<div class="invalid-feedback">{{ $__t('You have to select a shopping location') }}</div> <div class="invalid-feedback">{{ $__t('You have to select a store') }}</div>
</div> </div>

View File

@ -247,7 +247,7 @@
<li data-nav-for-page="shoppinglocations" data-sub-menu-of="#top-nav-manager-master-data"> <li data-nav-for-page="shoppinglocations" data-sub-menu-of="#top-nav-manager-master-data">
<a class="nav-link discrete-link" href="{{ $U('/shoppinglocations') }}"> <a class="nav-link discrete-link" href="{{ $U('/shoppinglocations') }}">
<i class="fas fa-shopping-cart"></i> <i class="fas fa-shopping-cart"></i>
<span class="nav-link-text">{{ $__t('Shopping locations') }}</span> <span class="nav-link-text">{{ $__t('Stores') }}</span>
</a> </a>
</li> </li>
@endif @endif

View File

@ -1,9 +1,9 @@
@extends('layout.default') @extends('layout.default')
@if($mode == 'edit') @if($mode == 'edit')
@section('title', $__t('Edit shopping location')) @section('title', $__t('Edit store'))
@else @else
@section('title', $__t('Create shopping location')) @section('title', $__t('Create store'))
@endif @endif
@section('viewJsName', 'shoppinglocationform') @section('viewJsName', 'shoppinglocationform')

View File

@ -1,6 +1,6 @@
@extends('layout.default') @extends('layout.default')
@section('title', $__t('Shopping locations')) @section('title', $__t('Stores'))
@section('activeNav', 'shoppinglocations') @section('activeNav', 'shoppinglocations')
@section('viewJsName', 'shoppinglocations') @section('viewJsName', 'shoppinglocations')

View File

@ -36,7 +36,7 @@
<th>{{ $__t('Best before date') }}</th> <th>{{ $__t('Best before date') }}</th>
@if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING)<th>{{ $__t('Location') }}</th>@endif @if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING)<th>{{ $__t('Location') }}</th>@endif
@if(GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) @if(GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING)
<th>{{ $__t('Shopping location') }}</th> <th>{{ $__t('Store') }}</th>
<th>{{ $__t('Price') }}</th> <th>{{ $__t('Price') }}</th>
@endif @endif
<th>{{ $__t('Purchased date') }}</th> <th>{{ $__t('Purchased date') }}</th>