From 616e1dd5d7c4539a6a6dd52a825780ac376f92bc Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Mon, 6 Sep 2021 22:26:31 +0200 Subject: [PATCH] Fixed negative number plural form handling (fixes #1601) --- public/js/grocy.js | 2 +- services/LocalizationService.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/grocy.js b/public/js/grocy.js index 2b997c1e..e44fe019 100644 --- a/public/js/grocy.js +++ b/public/js/grocy.js @@ -256,7 +256,7 @@ __n = function(number, singularForm, pluralForm) } } - return Grocy.Translator.n__(singularForm, pluralForm, number, number) + return Grocy.Translator.n__(singularForm, pluralForm, Math.abs(number), Math.abs(number)) } if (!Grocy.ActiveNav.isEmpty()) diff --git a/services/LocalizationService.php b/services/LocalizationService.php index 58013998..d2c43609 100644 --- a/services/LocalizationService.php +++ b/services/LocalizationService.php @@ -73,7 +73,7 @@ class LocalizationService { $this->CheckAndAddMissingTranslationToPot($singularForm); - return sprintf($this->Translator->ngettext($singularForm, $pluralForm, $number), $number); + return sprintf($this->Translator->ngettext($singularForm, $pluralForm, abs($number)), $number); } public function __t($text, ...$placeholderValues)