diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Translation] removed an uneeded class property

This commit is contained in:
Fabien Potencier 2013-04-20 10:25:59 +02:00
parent ad4624cd04
commit 4c4a0c4ef1
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Symfony/Component/Translation/Loader/XliffFileLoader.php
View File

@ -34,7 +34,7 @@ class XliffFileLoader implements LoaderInterface
throw new \InvalidArgumentException(sprintf('This is not a local file "%s".', $resource)); throw new \InvalidArgumentException(sprintf('This is not a local file "%s".', $resource));
} }
$xml = $this->parseFile($resource); list($xml, $encoding) = $this->parseFile($resource);
$xml->registerXPathNamespace('xliff', 'urn:oasis:names:tc:xliff:document:1.2'); $xml->registerXPathNamespace('xliff', 'urn:oasis:names:tc:xliff:document:1.2');
$catalogue = new MessageCatalogue($locale); $catalogue = new MessageCatalogue($locale);
@ -50,11 +50,11 @@ class XliffFileLoader implements LoaderInterface
// If the xlf file has another encoding specified, try to convert it because // If the xlf file has another encoding specified, try to convert it because
// simple_xml will always return utf-8 encoded values // simple_xml will always return utf-8 encoded values
if ('UTF-8' !== $this->encoding && !empty($this->encoding)) { if ('UTF-8' !== $encoding && !empty($encoding)) {
if (function_exists('mb_convert_encoding')) { if (function_exists('mb_convert_encoding')) {
$target = mb_convert_encoding($target, $this->encoding, 'UTF-8'); $target = mb_convert_encoding($target, $encoding, 'UTF-8');
} elseif (function_exists('iconv')) { } elseif (function_exists('iconv')) {
$target = iconv('UTF-8', $this->encoding, $target); $target = iconv('UTF-8', $encoding, $target);
} else { } else {
throw new \RuntimeException('No suitable convert encoding function (use UTF-8 as your encoding or install the iconv or mbstring extension).'); throw new \RuntimeException('No suitable convert encoding function (use UTF-8 as your encoding or install the iconv or mbstring extension).');
} }
@ -90,8 +90,6 @@ class XliffFileLoader implements LoaderInterface
throw new \RuntimeException(implode("\n", $this->getXmlErrors($internalErrors))); throw new \RuntimeException(implode("\n", $this->getXmlErrors($internalErrors)));
} }
$this->encoding = strtoupper($dom->encoding);
libxml_disable_entity_loader($disableEntities); libxml_disable_entity_loader($disableEntities);
foreach ($dom->childNodes as $child) { foreach ($dom->childNodes as $child) {
@ -125,7 +123,7 @@ class XliffFileLoader implements LoaderInterface
libxml_use_internal_errors($internalErrors); libxml_use_internal_errors($internalErrors);
return simplexml_import_dom($dom); return array(simplexml_import_dom($dom), strtoupper($dom->encoding));
} }
/** /**

4
src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
View File

@ -52,6 +52,10 @@ class XliffFileLoaderTest extends \PHPUnit_Framework_TestCase
public function testEncoding() public function testEncoding()
{ {
if (!function_exists('iconv') && !function_exists('mb_convert_encoding')) {
$this->markTestSkipped('The iconv and mbstring extensions are not available.');
}
$loader = $this->createLoader(); $loader = $this->createLoader();
$catalogue = $loader->load(__DIR__.'/../fixtures/encoding.xlf', 'en', 'domain1'); $catalogue = $loader->load(__DIR__.'/../fixtures/encoding.xlf', 'en', 'domain1');

4
src/Symfony/Component/Translation/Tests/fixtures/encoding.xlf vendored
View File

@ -4,11 +4,11 @@
<body> <body>
<trans-unit id="1" resname="foo"> <trans-unit id="1" resname="foo">
<source>foo</source> <source>foo</source>
<target>bär</target> <target>bär</target>
</trans-unit> </trans-unit>
<trans-unit id="2" resname="bar"> <trans-unit id="2" resname="bar">
<source>bar</source> <source>bar</source>
<target>föö</target> <target>föö</target>
</trans-unit> </trans-unit>
</body> </body>
</file> </file>