From 81f9d9a690ee540e640865d9e21f53ae8c37c6bf Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 21 Jun 2023 07:11:16 +0200 Subject: fix(l10n): Fix plural issue with different locale and language We need to use the language code here instead of the locale, because Symfony does not distinguish between the two and would otherwise e.g. with locale "Czech" and language "German" try to pick a non-existing plural rule, because Czech has 4 plural forms and German only 2. Signed-off-by: Joas Schilling --- lib/private/L10N/L10N.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/private/L10N/L10N.php b/lib/private/L10N/L10N.php index d0794c9c9c0..ea4aa0527bb 100644 --- a/lib/private/L10N/L10N.php +++ b/lib/private/L10N/L10N.php @@ -215,7 +215,12 @@ class L10N implements IL10N { public function getIdentityTranslator(): IdentityTranslator { if (\is_null($this->identityTranslator)) { $this->identityTranslator = new IdentityTranslator(); - $this->identityTranslator->setLocale($this->getLocaleCode()); + // We need to use the language code here instead of the locale, + // because Symfony does not distinguish between the two and would + // otherwise e.g. with locale "Czech" and language "German" try to + // pick a non-existing plural rule, because Czech has 4 plural forms + // and German only 2. + $this->identityTranslator->setLocale($this->getLanguageCode()); } return $this->identityTranslator; -- cgit v1.2.3