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

Unify translations strings which include an amount + quantity unit (references #161)

Browse Source
This commit is contained in:
Bernd Bestel 2019-05-05 14:31:27 +02:00
parent dd148a8fc3
commit e240260f9f
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
localization/strings.pot
View File

@ -352,7 +352,7 @@ msgstr ""
msgid "This means it is estimated that a new execution of this chore is tracked %s days after the last was tracked" msgid "This means it is estimated that a new execution of this chore is tracked %s days after the last was tracked"
msgstr "" msgstr ""
msgid "Removed %1$s %2$s of %3$s from stock" msgid "Removed %1$s of %2$s from stock"
msgstr "" msgstr ""
msgid "About grocy" msgid "About grocy"
@ -364,10 +364,10 @@ msgstr ""
msgid "Released on" msgid "Released on"
msgstr "" msgstr ""
msgid "Added %1$s %2$s of %3$s to stock" msgid "Added %1$s of %2$s to stock"
msgstr "" msgstr ""
msgid "Stock amount of %1$s is now %2$s %3$s" msgid "Stock amount of %1$s is now %2$s"
msgstr "" msgstr ""
msgid "Tracked execution of chore %1$s on %2$s" msgid "Tracked execution of chore %1$s on %2$s"

2
public/viewjs/consume.js
View File

@ -66,7 +66,7 @@
} }
Grocy.FrontendHelpers.EndUiBusy("consume-form"); Grocy.FrontendHelpers.EndUiBusy("consume-form");
toastr.success(__t('Removed %1$s %2$s of %3$s from stock', Math.abs(result.amount), __n(Math.abs(result.amount), productDetails.quantity_unit_stock.name, productDetails.quantity_unit_stock.name_plural), productDetails.product.name) + '<br><a class="btn btn-secondary btn-sm mt-2" href="#" onclick="UndoStockBooking(' + result.id + ')"><i class="fas fa-undo"></i> ' + __t("Undo") + '</a>'); toastr.success(__t('Removed %1$s of %2$s from stock', Math.abs(result.amount) + " " + __n(Math.abs(result.amount), productDetails.quantity_unit_stock.name, productDetails.quantity_unit_stock.name_plural), productDetails.product.name) + '<br><a class="btn btn-secondary btn-sm mt-2" href="#" onclick="UndoStockBooking(' + result.id + ')"><i class="fas fa-undo"></i> ' + __t("Undo") + '</a>');
$("#amount").attr("min", "1"); $("#amount").attr("min", "1");
$("#amount").attr("max", "999999"); $("#amount").attr("max", "999999");

2
public/viewjs/inventory.js
View File

@ -51,7 +51,7 @@
} }
Grocy.FrontendHelpers.EndUiBusy("inventory-form"); Grocy.FrontendHelpers.EndUiBusy("inventory-form");
toastr.success(__t('Stock amount of %1$s is now %2$s %3$s', productDetails.product.name, jsonForm.new_amount, __n(jsonForm.new_amount, productDetails.quantity_unit_stock.name, productDetails.quantity_unit_stock.name_plural)) + '<br><a class="btn btn-secondary btn-sm mt-2" href="#" onclick="UndoStockBooking(' + result.id + ')"><i class="fas fa-undo"></i> ' + __t("Undo") + '</a>'); toastr.success(__t('Stock amount of %1$s is now %2$s', productDetails.product.name, jsonForm.new_amount + " " + __n(jsonForm.new_amount, productDetails.quantity_unit_stock.name, productDetails.quantity_unit_stock.name_plural)) + '<br><a class="btn btn-secondary btn-sm mt-2" href="#" onclick="UndoStockBooking(' + result.id + ')"><i class="fas fa-undo"></i> ' + __t("Undo") + '</a>');
$('#inventory-change-info').addClass('d-none'); $('#inventory-change-info').addClass('d-none');
$("#tare-weight-handling-info").addClass("d-none"); $("#tare-weight-handling-info").addClass("d-none");

2
public/viewjs/purchase.js
View File

@ -53,7 +53,7 @@
); );
} }
var successMessage = __t('Added %1$s %2$s of %3$s to stock', result.amount, __n(result.amount, productDetails.quantity_unit_stock.name, productDetails.quantity_unit_stock.name_plural), productDetails.product.name) + '<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('Added %1$s of %2$s to stock', result.amount + " " +__n(result.amount, productDetails.quantity_unit_stock.name, productDetails.quantity_unit_stock.name_plural), productDetails.product.name) + '<br><a class="btn btn-secondary btn-sm mt-2" href="#" onclick="UndoStockBooking(' + result.id + ')"><i class="fas fa-undo"></i> ' + __t("Undo") + '</a>';
if (GetUriParam("flow") === "shoppinglistitemtostock" && typeof GetUriParam("embedded") !== undefined) if (GetUriParam("flow") === "shoppinglistitemtostock" && typeof GetUriParam("embedded") !== undefined)
{ {

2
public/viewjs/stockoverview.js
View File

@ -156,7 +156,7 @@ $(document).on('click', '.product-consume-button', function(e)
} }
Grocy.FrontendHelpers.EndUiBusy(); Grocy.FrontendHelpers.EndUiBusy();
toastr.success(__t('Removed %1$s %2$s of %3$s from stock', consumeAmount, productQuName, productName)); toastr.success(__t('Removed %1$s of %2$s from stock', consumeAmount, productQuName, productName));
RefreshContextualTimeago(); RefreshContextualTimeago();
RefreshStatistics(); RefreshStatistics();
}, },