upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 27

fix(l10n): Fix plural issue with different locale and language

Browse source 
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 <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2023-06-21 07:11:16 +02:00
parent 5fb7ea22be
commit ab8205fd35
No known key found for this signature in database
GPG key ID: 74434EFE0D2E2205
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/private/L10N/L10N.php
View file

@ -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;

9
tests/lib/L10N/L10nTest.php
View file

@ -85,6 +85,15 @@ class L10nTest extends TestCase {
$this->assertEquals('5 oken', (string)$l->n('%n window', '%n windows', 5));
}
public function testGermanPluralWithCzechLocaleTranslations() {
$transFile = \OC::$SERVERROOT.'/tests/data/l10n/de.json';
$l = new L10N($this->getFactory(), 'test', 'de', 'cs_CZ', [$transFile]);
$this->assertEquals('1 Datei', (string) $l->n('%n file', '%n files', 1));
$this->assertEquals('2 Dateien', (string) $l->n('%n file', '%n files', 2));
$this->assertEquals('5 Dateien', (string) $l->n('%n file', '%n files', 5));
}
public function dataPlaceholders(): array {
return [
['Ordered placeholders one %s two %s', 'Placeholder one 1 two 2'],