8000 Replace %count% with a given number out of the box by bocharsky-bw · Pull Request #19795 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

Replace %count% with a given number out of the box #19795

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

Closed
wants to merge 5 commits into from
Closed

Replace %count% with a given number out of the box #19795

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cfd4234
Replace %count% with a given number out of the box
bocharsky-bw Aug 31, 2016
d7eea5a
This merging was moved up to the translator
bocharsky-bw Aug 31, 2016
b324856
Revert "This merging was moved up to the translator"
bocharsky-bw Aug 31, 2016
ec2caca
Do not pass %count% value in tests
bocharsky-bw Aug 31, 2016
d133bef
Add test to check that %count% placeholder is overwritable with a cus…
bocharsky-bw Aug 31, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
8000 Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "This merging was moved up to the translator" 
This reverts commit d7eea5a.
  • Loading branch information
@bocharsky-bw
bocharsky-bw committed Aug 31, 2016
commit b324856a6239b17bd277ececcbe95005eea1475d
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public function trans($message, array $arguments = array(), $domain = null, $loc

public function transchoice($message, $count, array $arguments = array(), $domain = null, $locale = null)
{
return $this->translator->transChoice($message, $count, $arguments, $domain, $locale);
return $this->translator->transChoice($message, $count, array_merge(array('%count%' => $count), $arguments), $domain, $locale);
}

/**
Expand Down
0