diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

made the %count% variable automatically available when using the transchoice filter (similar to how the tag works)

Browse Source
This commit is contained in:
Fabien Potencier 2011-04-21 09:01:11 +02:00
parent ea021062ba
commit 54b77d24dd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
View File

@ -70,7 +70,7 @@ class TranslationExtension extends \Twig_Extension
public function transchoice($message, $count, array $arguments = array(), $domain = "messages")
{
return $this->translator->transChoice($message, $count, $arguments, $domain);
return $this->translator->transChoice($message, $count, array_merge(array('%count%' => $count), $arguments), $domain);
}
/**

4
tests/Symfony/Tests/Bridge/Twig/Extension/TranslationExtensionTest.php
View File

@ -84,8 +84,8 @@ class TranslationExtensionTest extends TestCase
array('{% set vars = { \'%name%\': \'Symfony2\' } %}{{ hello|trans(vars) }}', 'Hello Symfony2', array('hello' => 'Hello %name%')),
// transchoice filter
array('{{ "{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples"|transchoice(count, {\'%count%\': count}) }}', 'There is 5 apples', array('count' => 5)),
array('{{ text|transchoice(5, {\'%count%\': 5, \'%name%\': \'Symfony2\'}) }}', 'There is 5 apples (Symfony2)', array('text' => '{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%)')),
array('{{ "{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples"|transchoice(count) }}', 'There is 5 apples', array('count' => 5)),
array('{{ text|transchoice(5, {\'%name%\': \'Symfony2\'}) }}', 'There is 5 apples (Symfony2)', array('text' => '{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%)')),
);
}