merged branch fabpot/extrator-fix (PR #8869)

fabpot · fabpot · commit 0009deb055ec · 2013-08-28T19:35:19.000+02:00
This PR was merged into the 2.2 branch. Discussion ---------- [FrameworkBundle] added support for double-quoted strings in the extractor (closes #8797) | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #8797 | License | MIT | Doc PR | n/a Commits ------- 4922a80 [FrameworkBundle] added support for double-quoted strings in the extractor (closes #8797)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php
@@ -1,2 +1,3 @@
 This template is used for translation message extraction tests
-<?php echo $view['translator']->trans('new key') ?>
+<?php echo $view['translator']->trans('single-quoted key') ?>
+<?php echo $view['translator']->trans("double-quoted key") ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/PhpExtractorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/PhpExtractorTest.php
@@ -28,8 +28,9 @@ public function testExtraction()
         $extractor->extract(__DIR__.'/../Fixtures/Resources/views/', $catalogue);
 
         // Assert
-        $this->assertCount(1, $catalogue->all('messages'), '->extract() should find 1 translation');
-        $this->assertTrue($catalogue->has('new key'), '->extract() should find at leat "new key" message');
-        $this->assertEquals('prefixnew key', $catalogue->get('new key'), '->extract() should apply "prefix" as prefix');
+        $this->assertCount(2, $catalogue->all('messages'), '->extract() should find 1 translation');
+        $this->assertTrue($catalogue->has('single-quoted key'), '->extract() should find the "single-quoted key" message');
+        $this->assertTrue($catalogue->has('double-quoted key'), '->extract() should find the "double-quoted key" message');
+        $this->assertEquals('prefixsingle-quoted key', $catalogue->get('single-quoted key'), '->extract() should apply "prefix" as prefix');
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php b/src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php
@@ -111,7 +111,7 @@ protected function parseTokens($tokens, MessageCatalogue $catalog)
                     }
                 }
 
-                $message = trim($message, '\'');
+                $message = trim($message, '\'"');
 
                 if ($message) {
                     $catalog->set($message, $this->prefix.$message);

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,9 @@ public function testExtraction()`
`28`	`28`	`$extractor->extract(__DIR__.'/../Fixtures/Resources/views/', $catalogue);`
`29`	`29`
`30`	`30`	`// Assert`
`31`		`- $this->assertCount(1, $catalogue->all('messages'), '->extract() should find 1 translation');`
`32`		`- $this->assertTrue($catalogue->has('new key'), '->extract() should find at leat "new key" message');`
`33`		`- $this->assertEquals('prefixnew key', $catalogue->get('new key'), '->extract() should apply "prefix" as prefix');`
	`31`	`+ $this->assertCount(2, $catalogue->all('messages'), '->extract() should find 1 translation');`
	`32`	`+ $this->assertTrue($catalogue->has('single-quoted key'), '->extract() should find the "single-quoted key" message');`
	`33`	`+ $this->assertTrue($catalogue->has('double-quoted key'), '->extract() should find the "double-quoted key" message');`
	`34`	`+ $this->assertEquals('prefixsingle-quoted key', $catalogue->get('single-quoted key'), '->extract() should apply "prefix" as prefix');`
`34`	`35`	`}`
`35`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ protected function parseTokens($tokens, MessageCatalogue $catalog)`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`
`114`		`- $message = trim($message, '\'');`
	`114`	`+ $message = trim($message, '\'"');`
`115`	`115`
`116`	`116`	`if ($message) {`
`117`	`117`	`$catalog->set($message, $this->prefix.$message);`