Skip to content

[stable25] fix(l10n): Fix plural issue with different locale and language #39032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 1 commit into from
Jul 10, 2023
Merged

[stable25] fix(l10n): Fix plural issue with different locale and language #39032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Jun 27, 2023
commit 0559e263302573181d046a0cfdb8bd8489df527b
7 changes: 6 additions & 1 deletion lib/private/L10N/L10N.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,12 @@ public function getTranslations(): array {
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;
Expand Down
9 changes: 9 additions & 0 deletions tests/lib/L10N/L10nTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,15 @@ public function testCzechPluralTranslations() {
$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'],
Expand Down