upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-13 15:54:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge pull request #32159 from nextcloud/backport/32155/stable24

Browse source 
[stable24] Fx translations with trailing colon
This commit is contained in:
blizzz 2022-05-16 11:50:51 +02:00 committed by GitHub
commit 5b4df735ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/private/L10N/L10NString.php
View file

@ -74,10 +74,16 @@ class L10NString implements \JsonSerializable {
return 'Can not use pipe character in translations';
}
$beforeIdentity = $identity;
$identity = str_replace('%n', '%count%', $identity);
$parameters = [];
if ($beforeIdentity !== $identity) {
$parameters = ['%count%' => $this->count];
}
// $count as %count% as per \Symfony\Contracts\Translation\TranslatorInterface
$text = $identityTranslator->trans($identity, ['%count%' => $this->count]);
$text = $identityTranslator->trans($identity, $parameters);
return vsprintf($text, $this->parameters);
}

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

@ -35,6 +35,13 @@ class L10nTest extends TestCase {
return new Factory($config, $request, $userSession, \OC::$SERVERROOT);
}
public function testSimpleTranslationWithTrailingColon(): void {
$transFile = \OC::$SERVERROOT.'/tests/data/l10n/de.json';
$l = new L10N($this->getFactory(), 'test', 'de', 'de_AT', [$transFile]);
$this->assertEquals('Files:', $l->t('Files:'));
}
public function testGermanPluralTranslations() {
$transFile = \OC::$SERVERROOT.'/tests/data/l10n/de.json';
$l = new L10N($this->getFactory(), 'test', 'de', 'de_AT', [$transFile]);