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

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
grocy.openapi.json
View File

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

18
localization/strings.pot
View File

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

2
public/viewjs/components/productcard.js
View File

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

2
public/viewjs/shoppinglocations.js
View File

@ -25,7 +25,7 @@ $(document).on('click', '.shoppinglocation-delete-button', function (e)
var objectId = $(e.currentTarget).attr('data-shoppinglocation-id');
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,
buttons: {
confirm: {

4
views/components/shoppinglocationpicker.blade.php
View File

@ -9,12 +9,12 @@
@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 }}">
<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>
<option value=""></option>
@foreach($shoppinglocations as $shoppinglocation)
<option value="{{ $shoppinglocation->id }}">{{ $shoppinglocation->name }}</option>
@endforeach
</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>

2
views/layout/default.blade.php
View File

@ -247,7 +247,7 @@
<li data-nav-for-page="shoppinglocations" data-sub-menu-of="#top-nav-manager-master-data">
<a class="nav-link discrete-link" href="{{ $U('/shoppinglocations') }}">
<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>
</li>
@endif

4
views/shoppinglocationform.blade.php
View File

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

2
views/shoppinglocations.blade.php
View File

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

2
views/stockentries.blade.php
View File

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