[TwigBridge][Transchoice] set %count% from the current context.

symfony · May 1, 2014 · 8f7b2cc · kassymbekoff · May 26, 2014 · aitboudad
1 parent d1267cb
commit 8f7b2cc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/Symfony/Bridge/Twig/Node/TransNode.php b/src/Symfony/Bridge/Twig/Node/TransNode.php
@@ -98,9 +98,13 @@ protected function compileString(\Twig_NodeInterface $body, \Twig_Node_Expressio
         foreach ($matches[1] as $var) {
             $key = new \Twig_Node_Expression_Constant('%'.$var.'%', $body->getLine());
             if (!$vars->hasElement($key)) {
-                $varExpr = new \Twig_Node_Expression_Name($var, $body->getLine());
-                $varExpr->setAttribute('ignore_strict_check', $ignoreStrictCheck);
-                $vars->addElement($varExpr, $key);
+                if ('count' === $var) {
+                    $vars->addElement($this->getNode('count'), $key);
+                } else {
+                    $varExpr = new \Twig_Node_Expression_Name($var, $body->getLine());
+                    $varExpr->setAttribute('ignore_strict_check', $ignoreStrictCheck);
+                    $vars->addElement($varExpr, $key);
+                }
             }
         }
 

diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php
@@ -110,6 +110,8 @@ public function getTransTests()
                 'There is 5 apples (Symfony2)', array('count' => 5)),
             array('{% transchoice count into "fr"%}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
                 'There is no apples', array('count' => 0)),
+            array('{% transchoice 5 into "fr"%}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
+                'There is 5 apples'),
 
             // trans filter
             array('{{ "Hello"|trans }}', 'Hello'),