[TwigBridge] fixed the translator extractor that were not trimming the text in trans tags (closes #7056)

fabpot · fabpot · commit 83382bc7986f · 2013-02-27T08:36:53.000+01:00
Trimming was not done by the extractor but it was the default behavior
of the TransNode class. Now, things are consistent between the two.
diff --git a/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php b/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php
@@ -63,6 +63,7 @@ public function getExtractData()
             array('{{ "new key" | transchoice(1) | upper }}', array('new key' => 'messages')),
             array('{{ "new key" | transchoice(1, {}, "domain") }}', array('new key' => 'domain')),
             array('{% trans %}new key{% endtrans %}', array('new key' => 'messages')),
+            array('{% trans %}  new key  {% endtrans %}', array('new key' => 'messages')),
             array('{% trans from "domain" %}new key{% endtrans %}', array('new key' => 'domain')),
             array('{% set foo = "new key" | trans %}', array('new key' => 'messages')),
             array('{{ 1 ? "new key" | trans : "another key" | trans }}', array('new key' => 'messages', 'another key' => 'messages')),
diff --git a/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php b/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php
@@ -77,7 +77,7 @@ protected function extractTemplate($template, MessageCatalogue $catalogue)
         $this->twig->parse($this->twig->tokenize($template));
 
         foreach ($visitor->getMessages() as $message) {
-            $catalogue->set($message[0], $this->prefix.$message[0], $message[1] ? $message[1] : $this->defaultDomain);
+            $catalogue->set(trim($message[0]), $this->prefix.trim($message[0]), $message[1] ? $message[1] : $this->defaultDomain);
         }
 
         $visitor->disable();

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ protected function extractTemplate($template, MessageCatalogue $catalogue)`
`77`	`77`	`$this->twig->parse($this->twig->tokenize($template));`
`78`	`78`
`79`	`79`	`foreach ($visitor->getMessages() as $message) {`
`80`		`- $catalogue->set($message[0], $this->prefix.$message[0], $message[1] ? $message[1] : $this->defaultDomain);`
	`80`	`+ $catalogue->set(trim($message[0]), $this->prefix.trim($message[0]), $message[1] ? $message[1] : $this->defaultDomain);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`$visitor->disable();`