From d4c76aaa761694937950c02db7b192c632bb64dc Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Fri, 20 Sep 2019 10:30:46 +0200 Subject: [PATCH] Properly show qu plural forms on the product or qu conversion edit page --- public/viewjs/productform.js | 2 +- public/viewjs/quantityunitconversionform.js | 2 +- views/productform.blade.php | 2 +- views/quantityunitconversionform.blade.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/viewjs/productform.js b/public/viewjs/productform.js index f4fa151b..e6dac0db 100644 --- a/public/viewjs/productform.js +++ b/public/viewjs/productform.js @@ -203,7 +203,7 @@ $('.input-group-qu').on('change', function(e) if (factor > 1 || quIdPurchase != quIdStock) { - $('#qu-conversion-info').text(__t('This means 1 %1$s purchased will be converted into %2$s %3$s in stock', $("#qu_id_purchase option:selected").text(), (1 * factor).toString(), $("#qu_id_stock option:selected").text())); + $('#qu-conversion-info').text(__t('This means 1 %1$s purchased will be converted into %2$s %3$s in stock', $("#qu_id_purchase option:selected").text(), (1 * factor).toString(), __n((1 * factor).toString(), $("#qu_id_stock option:selected").text(), $("#qu_id_stock option:selected").data("plural-form")))); $('#qu-conversion-info').removeClass('d-none'); } else diff --git a/public/viewjs/quantityunitconversionform.js b/public/viewjs/quantityunitconversionform.js index fd9c81bd..56fd2475 100644 --- a/public/viewjs/quantityunitconversionform.js +++ b/public/viewjs/quantityunitconversionform.js @@ -98,7 +98,7 @@ $('.input-group-qu').on('change', function(e) if (fromQuId && toQuId) { - $('#qu-conversion-info').text(__t('This means 1 %1$s is the same as %2$s %3$s', $("#from_qu_id option:selected").text(), (1 * factor).toString(), $("#to_qu_id option:selected").text())); + $('#qu-conversion-info').text(__t('This means 1 %1$s is the same as %2$s %3$s', $("#from_qu_id option:selected").text(), (1 * factor).toString(), __n((1 * factor).toString(), $("#to_qu_id option:selected").text(), $("#to_qu_id option:selected").data("plural-form")))); $('#qu-conversion-info').removeClass('d-none'); } else diff --git a/views/productform.blade.php b/views/productform.blade.php index 4969b5d9..32529d45 100644 --- a/views/productform.blade.php +++ b/views/productform.blade.php @@ -143,7 +143,7 @@
{{ $__t('A quantity unit is required') }}
diff --git a/views/quantityunitconversionform.blade.php b/views/quantityunitconversionform.blade.php index 9cfa6cb4..989d4966 100644 --- a/views/quantityunitconversionform.blade.php +++ b/views/quantityunitconversionform.blade.php @@ -47,7 +47,7 @@
{{ $__t('A quantity unit is required') }}