WIP

aitboudad · aitboudad · commit d8b73693861f · 2016-04-13T13:03:09.000+01:00
diff --git a/src/Symfony/Bridge/Twig/Node/TransNode.php b/src/Symfony/Bridge/Twig/Node/TransNode.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Bridge\Twig\Node;
 
+use Symfony\Component\Translation\Formatter\TransMessageFormatter;
+
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  */
@@ -38,30 +40,39 @@ public function compile(\Twig_Compiler $compiler)
         }
         list($msg, $defaults) = $this->compileString($this->getNode('body'), $defaults, (bool) $vars);
 
-        $method = null === $this->getNode('count') ? 'trans' : 'transChoice';
 
         $compiler
-            ->write('echo $this->env->getExtension(\'translator\')->getTranslator()->'.$method.'(')
+            ->write('echo $this->env->getExtension(\'translator\')->getTranslator()->trans(')
             ->subcompile($msg)
         ;
 
         $compiler->raw(', ');
 
-        if (null !== $this->getNode('count')) {
-            $compiler
-                ->subcompile($this->getNode('count'))
-                ->raw(', ')
-            ;
-        }
-
-        if (null !== $vars) {
+        if (null !== $vars || null !== $this->getNode('count')) {
             $compiler
                 ->raw('array_merge(')
-                ->subcompile($defaults)
-                ->raw(', ')
-                ->subcompile($this->getNode('vars'))
-                ->raw(')')
-            ;
+                ->subcompile($defaults);
+
+            if (null !== $vars) {
+                $compiler
+                    ->raw(', ')
+                    ->subcompile($this->getNode('vars'))
+                ;
+            }
+
+            if (null !== $this->getNode('count')) {
+                $count = new \Twig_Node_Expression_Array(array(
+                    new \Twig_Node_Expression_Constant(TransMessageFormatter::TRANS_CHOICE, 0),
+                    new \Twig_Node_Expression_Constant($this->getNode('count'), 0),
+                ), 0);
+
+                $compiler
+                    ->raw(', ')
+                    ->subcompile($count)
+                ;
+            }
+
+            $compiler->raw(')');
         } else {
             $compiler->subcompile($defaults);
         }
