From 5318e79f557dbf0aa2c4673ff6391d2ee41e766b Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Sat, 20 Oct 2018 14:09:19 +0200 Subject: [PATCH] Properly pluralize quantity unit in success message on purchase/consume/inventory page --- public/viewjs/consume.js | 2 +- public/viewjs/inventory.js | 2 +- public/viewjs/purchase.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/viewjs/consume.js b/public/viewjs/consume.js index 861f5917..d04bd909 100644 --- a/public/viewjs/consume.js +++ b/public/viewjs/consume.js @@ -16,7 +16,7 @@ Grocy.Api.Get('stock/consume-product/' + jsonForm.product_id + '/' + jsonForm.amount + '?spoiled=' + spoiled, function(result) { - toastr.success(L('Removed #1 #2 of #3 from stock', jsonForm.amount, productDetails.quantity_unit_stock.name, productDetails.product.name)); + toastr.success(L('Removed #1 #2 of #3 from stock', jsonForm.amount, Pluralize(jsonForm.amount, productDetails.quantity_unit_stock.name, productDetails.quantity_unit_stock.name_plural), productDetails.product.name)); $('#amount').val(1); Grocy.Components.ProductPicker.SetValue(''); diff --git a/public/viewjs/inventory.js b/public/viewjs/inventory.js index a41a4841..1ba6e058 100644 --- a/public/viewjs/inventory.js +++ b/public/viewjs/inventory.js @@ -32,7 +32,7 @@ ); } - toastr.success(L('Stock amount of #1 is now #2 #3', productDetails.product.name, jsonForm.new_amount, productDetails.quantity_unit_stock.name)); + toastr.success(L('Stock amount of #1 is now #2 #3', productDetails.product.name, jsonForm.new_amount, Pluralize(jsonForm.new_amount, productDetails.quantity_unit_stock.name, productDetails.quantity_unit_stock.name_plural))); if (addBarcode !== undefined) { diff --git a/public/viewjs/purchase.js b/public/viewjs/purchase.js index 23fb089c..341103c9 100644 --- a/public/viewjs/purchase.js +++ b/public/viewjs/purchase.js @@ -40,7 +40,7 @@ ); } - toastr.success(L('Added #1 #2 of #3 to stock', amount, productDetails.quantity_unit_stock.name, productDetails.product.name)); + toastr.success(L('Added #1 #2 of #3 to stock', amount, Pluralize(amount, productDetails.quantity_unit_stock.name, productDetails.quantity_unit_stock.name_plural), productDetails.product.name)); if (addBarcode !== undefined) {