[Twig] added a way to use % in a trans string (closes #981)

symfony · May 25, 2011 · dcd490e · dcd490e
1 parent be046bc
commit dcd490e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/Symfony/Bridge/Twig/Node/TransNode.php b/src/Symfony/Bridge/Twig/Node/TransNode.php
@@ -104,13 +104,13 @@ protected function compileString(\Twig_NodeInterface $body, \Twig_Node_Expressio
             $current[$name] = true;
         }
 
-        preg_match_all('/\%([^\%]+)\%/', $msg, $matches);
+        preg_match_all('/(?<!%)%([^%]+)%/', $msg, $matches);
         foreach ($matches[1] as $var) {
             if (!isset($current['%'.$var.'%'])) {
                 $vars->setNode('%'.$var.'%', new \Twig_Node_Expression_Name($var, $body->getLine()));
             }
         }
 
-        return array(new \Twig_Node_Expression_Constant(trim($msg), $body->getLine()), $vars);
+        return array(new \Twig_Node_Expression_Constant(str_replace('%%', '%', trim($msg)), $body->getLine()), $vars);
     }
 }
diff --git a/tests/Symfony/Tests/Bridge/Twig/Extension/TranslationExtensionTest.php b/tests/Symfony/Tests/Bridge/Twig/Extension/TranslationExtensionTest.php
@@ -25,6 +25,13 @@ protected function setUp()
         }
     }
 
+    public function testEscaping()
+    {
+        $output = $this->getTemplate('{% trans %}Percent: %value%%% (%msg%){% endtrans %}')->render(array('value' => 12, 'msg' => 'approx.'));
+
+        $this->assertEquals('Percent: 12% (approx.)', $output);
+    }
+
     /**
      * @dataProvider getTransTests
      */