ops

aitboudad · aitboudad · commit 63236fab6908 · 2016-03-28T20:00:11.000+01:00
diff --git a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
@@ -15,6 +15,7 @@
 use Symfony\Bridge\Twig\TokenParser\TransChoiceTokenParser;
 use Symfony\Bridge\Twig\TokenParser\TransDefaultDomainTokenParser;
 use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Component\Translation\Formatter\TransMessageFormatter;
 use Symfony\Bridge\Twig\NodeVisitor\TranslationNodeVisitor;
 use Symfony\Bridge\Twig\NodeVisitor\TranslationDefaultDomainNodeVisitor;
 
@@ -95,7 +96,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, array_merge(array('%count%' => $count), $arguments), $domain, $locale);
+        return $this->translator->trans($message, array_merge(array(TransMessageFormatter::TRANS_CHOICE => $count, '%count%' => $count), $arguments), $domain, $locale);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`use Symfony\Bridge\Twig\TokenParser\TransChoiceTokenParser;`
`16`	`16`	`use Symfony\Bridge\Twig\TokenParser\TransDefaultDomainTokenParser;`
`17`	`17`	`use Symfony\Component\Translation\TranslatorInterface;`
	`18`	`+use Symfony\Component\Translation\Formatter\TransMessageFormatter;`
`18`	`19`	`use Symfony\Bridge\Twig\NodeVisitor\TranslationNodeVisitor;`
`19`	`20`	`use Symfony\Bridge\Twig\NodeVisitor\TranslationDefaultDomainNodeVisitor;`
`20`	`21`
`@@ -95,7 +96,7 @@ public function trans($message, array $arguments = array(), $domain = null, $loc`
`95`	`96`
`96`	`97`	`public function transchoice($message, $count, array $arguments = array(), $domain = null, $locale = null)`
`97`	`98`	`{`
`98`		`- return $this->translator->transChoice($message, $count, array_merge(array('%count%' => $count), $arguments), $domain, $locale);`
	`99`	`+ return $this->translator->trans($message, array_merge(array(TransMessageFormatter::TRANS_CHOICE => $count, '%count%' => $count), $arguments), $domain, $locale);`
`99`	`100`	`}`
`100`	`101`
`101`	`102`	`/**`