From 3c6495ac83638ee619ebc553b54abce1d49062c9 Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Thu, 19 Dec 2019 19:32:41 +0100 Subject: [PATCH] Some localization string changes & fixes --- localization/en/stock_transaction_types.po | 6 ++++++ localization/stock_transaction_types.pot | 6 ++++++ localization/strings.pot | 24 ++++++++++++++++++++++ public/viewjs/stockedit.js | 2 +- views/components/productcard.blade.php | 2 +- views/stockdetail.blade.php | 8 ++++---- views/stockedit.blade.php | 2 +- views/stockoverview.blade.php | 2 +- 8 files changed, 44 insertions(+), 8 deletions(-) diff --git a/localization/en/stock_transaction_types.po b/localization/en/stock_transaction_types.po index 26fecbdc..d8b65ef1 100644 --- a/localization/en/stock_transaction_types.po +++ b/localization/en/stock_transaction_types.po @@ -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)" diff --git a/localization/stock_transaction_types.pot b/localization/stock_transaction_types.pot index b3ce24e9..48930d28 100644 --- a/localization/stock_transaction_types.pot +++ b/localization/stock_transaction_types.pot @@ -29,3 +29,9 @@ msgstr "" msgid "product-opened" msgstr "" + +msgid "stock-edit-old" +msgstr "" + +msgid "stock-edit-new" +msgstr "" diff --git a/localization/strings.pot b/localization/strings.pot index 27bd390d..f78fdef0 100644 --- a/localization/strings.pot +++ b/localization/strings.pot @@ -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 "" diff --git a/public/viewjs/stockedit.js b/public/viewjs/stockedit.js index 8858b499..24bea2b8 100644 --- a/public/viewjs/stockedit.js +++ b/public/viewjs/stockedit.js @@ -84,7 +84,7 @@ $('#save-stockedit-button').on('click', function(e) Grocy.Api.Put("stock", jsonData, function(result) { - var successMessage = __t('Updated Stock detail') + '
' + __t("Undo") + ''; + var successMessage = __t('Stock entry successfully updated') + '
' + __t("Undo") + ''; window.parent.postMessage(WindowMessageBag("StockDetailChanged", stockRowId), Grocy.BaseUrl); window.parent.postMessage(WindowMessageBag("ShowSuccessMessage", successMessage), Grocy.BaseUrl); diff --git a/views/components/productcard.blade.php b/views/components/productcard.blade.php index 0534e0a9..9c00e940 100644 --- a/views/components/productcard.blade.php +++ b/views/components/productcard.blade.php @@ -23,7 +23,7 @@ {{ $__t('Stock amount') . ' / ' . $__t('Quantity unit') }}:
- @if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING){{ $__t('Default Location') }}:
@endif + @if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING){{ $__t('Default location') }}:
@endif {{ $__t('Last purchased') }}:
{{ $__t('Last used') }}:
@if(GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING){{ $__t('Last price') }}:
@endif diff --git a/views/stockdetail.blade.php b/views/stockdetail.blade.php index cca2b010..81680a73 100644 --- a/views/stockdetail.blade.php +++ b/views/stockdetail.blade.php @@ -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 @@ {{ $__t('Best before date') }} @if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING){{ $__t('Location') }}@endif @if(GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING){{ $__t('Price') }}@endif - {{ $__t('Purchased Date') }} + {{ $__t('Purchased date') }} @include('components.userfields_thead', array( 'userfields' => $userfields @@ -60,7 +60,7 @@ data-consume-amount="1"> 1 - - {{ $__t('Stock Edit') }} + {{ $__t('Stock edit') }}
diff --git a/views/stockedit.blade.php b/views/stockedit.blade.php index 9f5d74d9..6a0a9c76 100644 --- a/views/stockedit.blade.php +++ b/views/stockedit.blade.php @@ -1,6 +1,6 @@ @extends('layout.default') -@section('title', $__t('Stock Edit')) +@section('title', $__t('Stock edit')) @section('activeNav', 'stockedit') @section('viewJsName', 'stockedit') diff --git a/views/stockoverview.blade.php b/views/stockoverview.blade.php index 18a8f60a..f5a88087 100644 --- a/views/stockoverview.blade.php +++ b/views/stockoverview.blade.php @@ -156,7 +156,7 @@ - {{ $__t('Show stock details') }} + {{ $__t('Show stock entries') }} {{ $__t('Stock journal for this product') }}