github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-05 20:36:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some localization string changes & fixes

Browse Source
This commit is contained in:
Bernd Bestel 2019-12-19 19:32:41 +01:00
parent 955b34e524
commit 3c6495ac83
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
8 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
localization/en/stock_transaction_types.po
View File

@ -29,3 +29,9 @@ msgstr "Inventory correction"
msgid "product-opened"
msgstr "Product opened"
msgid "stock-edit-old"
msgstr "Stock entry edited (old values)"
msgid "stock-edit-new"
msgstr "Stock entry edited (new values)"

6
localization/stock_transaction_types.pot
View File

@ -29,3 +29,9 @@ msgstr ""
msgid "product-opened"
msgstr ""
msgid "stock-edit-old"
msgstr ""
msgid "stock-edit-new"
msgstr ""

24
localization/strings.pot
View File

@ -1582,3 +1582,27 @@ msgstr ""
msgid "Transfered %1$s of %2$s from %3$s to %4$s"
msgstr ""
msgid "Show stock entries"
msgstr ""
msgid "Stock entry"
msgstr ""
msgid "Best before date"
msgstr ""
msgid "Purchased date"
msgstr ""
msgid "Consume all %s for this stock entry"
msgstr ""
msgid "Stock edit"
msgstr ""
msgid "The amount cannot be lower than %1$s"
msgstr ""
msgid "Stock entry successfully updated"
msgstr ""

2
public/viewjs/stockedit.js
View File

@ -84,7 +84,7 @@ $('#save-stockedit-button').on('click', function(e)
Grocy.Api.Put("stock", jsonData,
function(result)
{
var successMessage = __t('Updated Stock detail') + '<br><a class="btn btn-secondary btn-sm mt-2" href="#" onclick="UndoStockBooking(\'' + result.id + '\')"><i class="fas fa-undo"></i> ' + __t("Undo") + '</a>';
var successMessage = __t('Stock entry successfully updated') + '<br><a class="btn btn-secondary btn-sm mt-2" href="#" onclick="UndoStockBooking(\'' + result.id + '\')"><i class="fas fa-undo"></i> ' + __t("Undo") + '</a>';
window.parent.postMessage(WindowMessageBag("StockDetailChanged", stockRowId), Grocy.BaseUrl);
window.parent.postMessage(WindowMessageBag("ShowSuccessMessage", successMessage), Grocy.BaseUrl);

2
views/components/productcard.blade.php
View File

@ -23,7 +23,7 @@
<strong>{{ $__t('Stock amount') . ' / ' . $__t('Quantity unit') }}:</strong> <span id="productcard-product-stock-amount" class="locale-number locale-number-quantity-amount"></span> <span id="productcard-product-stock-qu-name"></span> <span id="productcard-product-stock-opened-amount" class="small font-italic locale-number locale-number-quantity-amount"></span>
<span id="productcard-aggregated-amounts" class="pl-2 text-secondary d-none"><i class="fas fa-custom-sigma-sign"></i> <span id="productcard-product-stock-amount-aggregated" class="locale-number locale-number-quantity-amount"></span> <span id="productcard-product-stock-qu-name-aggregated"></span> <span id="productcard-product-stock-opened-amount-aggregated locale-number locale-number-quantity-amount" class="small font-italic"></span></span><br>
@if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING)<strong>{{ $__t('Default Location') }}:</strong> <span id="productcard-product-location"></span><br>@endif
@if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING)<strong>{{ $__t('Default location') }}:</strong> <span id="productcard-product-location"></span><br>@endif
<strong>{{ $__t('Last purchased') }}:</strong> <span id="productcard-product-last-purchased"></span> <time id="productcard-product-last-purchased-timeago" class="timeago timeago-contextual"></time><br>
<strong>{{ $__t('Last used') }}:</strong> <span id="productcard-product-last-used"></span> <time id="productcard-product-last-used-timeago" class="timeago timeago-contextual"></time><br>
@if(GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING)<strong>{{ $__t('Last price') }}:</strong> <span id="productcard-product-last-price"></span><br>@endif

8
views/stockdetail.blade.php
View File

@ -1,6 +1,6 @@
@extends('layout.default')
@section('title', $__t('Stock detail'))
@section('title', $__t('Stock entry'))
@section('activeNav', 'stockdetail')
@section('viewJsName', 'stockdetail')
@ -39,7 +39,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('Price') }}</th>@endif
<th>{{ $__t('Purchased Date') }}</th>
<th>{{ $__t('Purchased date') }}</th>
@include('components.userfields_thead', array(
'userfields' => $userfields
@ -60,7 +60,7 @@
data-consume-amount="1">
<i class="fas fa-utensils"></i> 1
</a>
<a id="stock-{{ $currentStockEntry->id }}-consume-all-button" class="btn btn-danger btn-sm stock-consume-button @if($currentStockEntry->amount == 0) disabled @endif" href="#" data-toggle="tooltip" data-placement="right" title="{{ $__t('Consume all %s for this stock detail', FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->name) }}"
<a id="stock-{{ $currentStockEntry->id }}-consume-all-button" class="btn btn-danger btn-sm stock-consume-button @if($currentStockEntry->amount == 0) disabled @endif" href="#" data-toggle="tooltip" data-placement="right" title="{{ $__t('Consume all %s for this stock entry', FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->name) }}"
data-product-id="{{ $currentStockEntry->product_id }}"
data-stock-id="{{ $currentStockEntry->stock_id }}"
data-stockrow-id="{{ $currentStockEntry->id }}"
@ -114,7 +114,7 @@
data-product-id="{{ $currentStockEntry->product_id }}"
data-location-id="{{ $currentStockEntry->location_id }}"
data-id="{{ $currentStockEntry->id }}">
<i class="fas fa-boxes"></i> {{ $__t('Stock Edit') }}
<i class="fas fa-boxes"></i> {{ $__t('Stock edit') }}
</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item product-name-cell" data-product-id="{{ $currentStockEntry->product_id }}" type="button" href="#">

2
views/stockedit.blade.php
View File

@ -1,6 +1,6 @@
@extends('layout.default')
@section('title', $__t('Stock Edit'))
@section('title', $__t('Stock edit'))
@section('activeNav', 'stockedit')
@section('viewJsName', 'stockedit')

2
views/stockoverview.blade.php
View File

@ -156,7 +156,7 @@
</a>
<a class="dropdown-item" type="button" href="{{ $U('/stockdetail?product=') }}{{ $currentStockEntry->product_id }}"
data-product-id="{{ $currentStockEntry->product_id }}">
<i class="fas fa-boxes"></i> {{ $__t('Show stock details') }}
<i class="fas fa-boxes"></i> {{ $__t('Show stock entries') }}
</a>
<a class="dropdown-item" type="button" href="{{ $U('/stockjournal?product=') }}{{ $currentStockEntry->product_id }}">
<i class="fas fa-file-alt"></i> {{ $__t('Stock journal for this product') }}