github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-08 13:46:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed negative number plural form handling (fixes #1601)

Browse Source
This commit is contained in:
Bernd Bestel 2021-09-06 22:26:31 +02:00
parent a323bca9ec
commit 616e1dd5d7
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/grocy.js
View File

@ -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()) if (!Grocy.ActiveNav.isEmpty())

2
services/LocalizationService.php
View File

@ -73,7 +73,7 @@ class LocalizationService
{ {
$this->CheckAndAddMissingTranslationToPot($singularForm); $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) public function __t($text, ...$placeholderValues)