Skip to content

[stable24] Fx translations with trailing colon #32159

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 2 commits into from
May 16, 2022
Merged

[stable24] Fx translations with trailing colon #32159

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b7ab9c
Add a unit test for translation with trailing colon
nickvergessen Apr 26, 2022
d1dc2a1
Fix translations with trailing colons
nickvergessen Apr 26, 2022
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
Prev Previous commit
Fix translations with trailing colons 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen @backportbot
nickvergessen authored and backportbot[bot] committed Apr 26, 2022
commit d1dc2a18eefd4125981acb92f36ce205977baa50
8 changes: 7 additions & 1 deletion lib/private/L10N/L10NString.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,16 @@ public function __toString(): string {
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);
}
Expand Down