Changed placeholders

florianv · florianv · commit a04175ec9c20 · 2014-03-03T18:14:46.000+01:00
diff --git a/src/Symfony/Component/Translation/Dumper/FileDumper.php b/src/Symfony/Component/Translation/Dumper/FileDumper.php
@@ -29,7 +29,7 @@ abstract class FileDumper implements DumperInterface
      *
      * @var string
      */
-    protected $relativePathTemplate = '{domain}.{locale}.{extension}';
+    protected $relativePathTemplate = '%domain%.%locale%.%extension%';
 
     /**
      * Sets the template for the relative paths to files.
@@ -95,9 +95,9 @@ abstract protected function getExtension();
     private function getRelativePath($domain, $locale)
     {
         return strtr($this->relativePathTemplate, array(
-            '{domain}' => $domain,
-            '{locale}' => $locale,
-            '{extension}' => $this->getExtension()
+            '%domain%' => $domain,
+            '%locale%' => $locale,
+            '%extension%' => $this->getExtension()
         ));
     }
 }
diff --git a/src/Symfony/Component/Translation/Dumper/IcuResFileDumper.php b/src/Symfony/Component/Translation/Dumper/IcuResFileDumper.php
@@ -23,7 +23,7 @@ class IcuResFileDumper extends FileDumper
     /**
      * {@inheritDoc}
      */
-    protected $relativePathTemplate = '{domain}/{locale}.{extension}';
+    protected $relativePathTemplate = '%domain%/%locale%.%extension%';
 
     /**
      * {@inheritDoc}
diff --git a/src/Symfony/Component/Translation/Tests/Dumper/FileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/FileDumperTest.php
@@ -46,7 +46,7 @@ public function testDumpCreatesNestedDirectoriesAndFile()
         $catalogue->add(array('foo' => 'bar'));
 
         $dumper = new ConcreteFileDumper();
-        $dumper->setRelativePathTemplate('test/translations/{domain}.{locale}.{extension}');
+        $dumper->setRelativePathTemplate('test/translations/%domain%.%locale%.%extension%');
         $dumper->dump($catalogue, array('path' => $tempDir));
 
         $this->assertTrue(file_exists($file));
diff --git a/src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php
@@ -31,8 +31,8 @@ public function testDump()
 
         $this->assertEquals(file_get_contents(__DIR__.'/../fixtures/resourcebundle/res/en.res'), file_get_contents($tempDir.'/messages/en.res'));
 
-        unlink($tempDir.'/messages/en.res');
-        rmdir($tempDir.'/messages');
-        rmdir($tempDir);
+        @unlink($tempDir.'/messages/en.res');
+        @rmdir($tempDir.'/messages');
+        @rmdir($tempDir);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ abstract class FileDumper implements DumperInterface`
`29`	`29`	`*`
`30`	`30`	`* @var string`
`31`	`31`	`*/`
`32`		`- protected $relativePathTemplate = '{domain}.{locale}.{extension}';`
	`32`	`+ protected $relativePathTemplate = '%domain%.%locale%.%extension%';`
`33`	`33`
`34`	`34`	`/**`
`35`	`35`	`* Sets the template for the relative paths to files.`
`@@ -95,9 +95,9 @@ abstract protected function getExtension();`
`95`	`95`	`private function getRelativePath($domain, $locale)`
`96`	`96`	`{`
`97`	`97`	`return strtr($this->relativePathTemplate, array(`
`98`		`- '{domain}' => $domain,`
`99`		`- '{locale}' => $locale,`
`100`		`- '{extension}' => $this->getExtension()`
	`98`	`+ '%domain%' => $domain,`
	`99`	`+ '%locale%' => $locale,`
	`100`	`+ '%extension%' => $this->getExtension()`
`101`	`101`	`));`
`102`	`102`	`}`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ public function testDump()`
`31`	`31`
`32`	`32`	`$this->assertEquals(file_get_contents(__DIR__.'/../fixtures/resourcebundle/res/en.res'), file_get_contents($tempDir.'/messages/en.res'));`
`33`	`33`
`34`		`- unlink($tempDir.'/messages/en.res');`
`35`		`- rmdir($tempDir.'/messages');`
`36`		`- rmdir($tempDir);`
	`34`	`+ @unlink($tempDir.'/messages/en.res');`
	`35`	`+ @rmdir($tempDir.'/messages');`
	`36`	`+ @rmdir($tempDir);`
`37`	`37`	`}`
`38`	`38`	`}`