8000 Changed placeholders · symfony/symfony@a04175e · GitHub
[go: up one dir, main page]
Skip to content

Commit a04175e

Browse files
florianvflorianv
committed
Changed placeholders
1 parent 623d149 commit a04175e

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

‎src/Symfony/Component/Translation/Dumper/FileDumper.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ abstract class FileDumper implements DumperInterface
2929
*
3030
* @var string
3131
*/
32-
protected $relativePathTemplate = '{domain}.{locale}.{extension}';
32+
protected $relativePathTemplate = '%domain%.%locale%.%extension%';
3333

3434
/**
3535
* Sets the template for the relative paths to files.
@@ -95,9 +95,9 @@ abstract protected function getExtension();
9595
private function getRelativePath($domain, $locale)
9696
{
9797
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()
101101
));
102102
}
103103
}

‎src/Symfony/Component/Translation/Dumper/IcuResFileDumper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class IcuResFileDumper extends FileDumper
2323
/**
2424
* {@inheritDoc}
2525
*/
26-
protected $relativePathTemplate = '{domain}/{locale}.{extension}';
26+
protected $relativePathTemplate = '%domain%/%locale%.%extension%';
2727

2828
/**
2929
* {@inheritDoc}

‎src/Symfony/Component/Translation/Tests/Dumper/FileDumperTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function testDumpCreatesNestedDirectoriesAndFile()
4646
$catalogue->add(array('foo' => 'bar'));
4747

4848
$dumper = new ConcreteFileDumper();
49-
$dumper->setRelativePathTemplate('test/translations/{domain}.{locale}.{extension}');
49+
$dumper->setRelativePathTemplate('test/translations/%domain%.%locale%.%extension%');
5050
$dumper->dump($catalogue, array('path' => $tempDir));
5151

5252
$this->assertTrue(file_exists($file));

‎src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ public function testDump()
3131

3232
$this->assertEquals(file_get_contents(__DIR__.'/../fixtures/resourcebundle/res/en.res'), file_get_contents($tempDir.'/messages/en.res'));
3333

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);
3737
}
3838
}

0 commit comments

Comments
 (0)
0