mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix languages that miss a string in the translation 

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2021-03-30 21:04:41 +02:00
parent a4c6749b02
commit 439457d2b4
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/private/L10N/L10NString.php
View File

@ -59,12 +59,6 @@ class L10NString implements \JsonSerializable {
public function __toString(): string {
$translations = $this->l10n->getTranslations();
$pipeCheck = implode('', $translations[$this->text]);
if (strpos($pipeCheck, '|') !== false) {
return 'Can not use pipe character in translations';
}
$identityTranslator = $this->l10n->getIdentityTranslator();
$parameters = $this->parameters;
@ -72,7 +66,22 @@ class L10NString implements \JsonSerializable {
$parameters['%count%'] = $this->count;
// Use the indexed version as per \Symfony\Contracts\Translation\TranslatorInterface
$identity = implode('|', $translations[$this->text]);
$identity = $this->text;
if (array_key_exists($this->text, $translations)) {
$identity = $translations[$this->text];
}
if (is_array($identity)) {
$pipeCheck = implode('', $identity);
if (strpos($pipeCheck, '|') !== false) {
return 'Can not use pipe character in translations';
}
$identity = implode('|', $identity);
} else if (strpos($identity, '|') !== false) {
return 'Can not use pipe character in translations';
}
$identity = str_replace('%n', '%count%', $identity);
return $identityTranslator->trans($identity, $parameters);