diff --git a/src/Symfony/Component/Translation/CHANGELOG.md b/src/Symfony/Component/Translation/CHANGELOG.md
index 87eb2fa4a3775..42ae7789fa192 100644
--- a/src/Symfony/Component/Translation/CHANGELOG.md
+++ b/src/Symfony/Component/Translation/CHANGELOG.md
@@ -1,6 +1,11 @@
CHANGELOG
=========
+4.3.0
+-----
+
+ * Improved Xliff 1.2 loader to load the original file's metadata
+
4.2.0
-----
diff --git a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
index 1106ec65f0e2c..33599400c5db8 100644
--- a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
+++ b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
@@ -82,38 +82,50 @@ private function extractXliff1(\DOMDocument $dom, MessageCatalogue $catalogue, s
$xml = simplexml_import_dom($dom);
$encoding = strtoupper($dom->encoding);
- $xml->registerXPathNamespace('xliff', 'urn:oasis:names:tc:xliff:document:1.2');
- foreach ($xml->xpath('//xliff:trans-unit') as $translation) {
- $attributes = $translation->attributes();
+ $namespace = 'urn:oasis:names:tc:xliff:document:1.2';
+ $xml->registerXPathNamespace('xliff', $namespace);
- if (!(isset($attributes['resname']) || isset($translation->source))) {
- continue;
- }
+ foreach ($xml->xpath('//xliff:file') as $file) {
+ $fileAttributes = $file->attributes();
- $source = isset($attributes['resname']) && $attributes['resname'] ? $attributes['resname'] : $translation->source;
- // If the xlf file has another encoding specified, try to convert it because
- // simple_xml will always return utf-8 encoded values
- $target = $this->utf8ToCharset((string) (isset($translation->target) ? $translation->target : $translation->source), $encoding);
+ $file->registerXPathNamespace('xliff', $namespace);
- $catalogue->set((string) $source, $target, $domain);
+ foreach ($file->xpath('.//xliff:trans-unit') as $translation) {
+ $attributes = $translation->attributes();
- $metadata = array();
- if ($notes = $this->parseNotesMetadata($translation->note, $encoding)) {
- $metadata['notes'] = $notes;
- }
+ if (!(isset($attributes['resname']) || isset($translation->source))) {
+ continue;
+ }
- if (isset($translation->target) && $translation->target->attributes()) {
- $metadata['target-attributes'] = array();
- foreach ($translation->target->attributes() as $key => $value) {
- $metadata['target-attributes'][$key] = (string) $value;
+ $source = isset($attributes['resname']) && $attributes['resname'] ? $attributes['resname'] : $translation->source;
+ // If the xlf file has another encoding specified, try to convert it because
+ // simple_xml will always return utf-8 encoded values
+ $target = $this->utf8ToCharset((string) ($translation->target ?? $translation->source), $encoding);
+
+ $catalogue->set((string) $source, $target, $domain);
+
+ $metadata = array(
+ 'file' => array(
+ 'original' => (string) $fileAttributes['original'],
+ ),
+ );
+ if ($notes = $this->parseNotesMetadata($translation->note, $encoding)) {
+ $metadata['notes'] = $notes;
}
- }
- if (isset($attributes['id'])) {
- $metadata['id'] = (string) $attributes['id'];
- }
+ if (isset($translation->target) && $translation->target->attributes()) {
+ $metadata['target-attributes'] = array();
+ foreach ($translation->target->attributes() as $key => $value) {
+ $metadata['target-attributes'][$key] = (string) $value;
+ }
+ }
- $catalogue->setMetadata((string) $source, $metadata, $domain);
+ if (isset($attributes['id'])) {
+ $metadata['id'] = (string) $attributes['id'];
+ }
+
+ $catalogue->setMetadata((string) $source, $metadata, $domain);
+ }
}
}
diff --git a/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
index c6958486c1206..cf21c8227f7e4 100644
--- a/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
+++ b/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
@@ -84,7 +84,16 @@ public function testEncoding()
$this->assertEquals(utf8_decode('föö'), $catalogue->get('bar', 'domain1'));
$this->assertEquals(utf8_decode('bär'), $catalogue->get('foo', 'domain1'));
- $this->assertEquals(array('notes' => array(array('content' => utf8_decode('bäz'))), 'id' => '1'), $catalogue->getMetadata('foo', 'domain1'));
+ $this->assertEquals(
+ array(
+ 'notes' => array(array('content' => utf8_decode('bäz'))),
+ 'id' => '1',
+ 'file' => array(
+ 'original' => 'file.ext',
+ ),
+ ),
+ $catalogue->getMetadata('foo', 'domain1')
+ );
}
public function testTargetAttributesAreStoredCorrectly()
@@ -164,11 +173,41 @@ public function testLoadNotes()
$loader = new XliffFileLoader();
$catalogue = $loader->load(__DIR__.'/../fixtures/withnote.xlf', 'en', 'domain1');
- $this->assertEquals(array('notes' => array(array('priority' => 1, 'content' => 'foo')), 'id' => '1'), $catalogue->getMetadata('foo', 'domain1'));
+ $this->assertEquals(
+ array(
+ 'notes' => array(array('priority' => 1, 'content' => 'foo')),
+ 'id' => '1',
+ 'file' => array(
+ 'original' => 'file.ext',
+ ),
+ ),
+ $catalogue->getMetadata('foo', 'domain1')
+ );
// message without target
- $this->assertEquals(array('notes' => array(array('content' => 'bar', 'from' => 'foo')), 'id' => '2'), $catalogue->getMetadata('extra', 'domain1'));
+ $this->assertEquals(
+ array(
+ 'notes' => array(array('content' => 'bar', 'from' => 'foo')),
+ 'id' => '2',
+ 'file' => array(
+ 'original' => 'file.ext',
+ ),
+ ),
+ $catalogue->getMetadata('extra', 'domain1')
+ );
// message with empty target
- $this->assertEquals(array('notes' => array(array('content' => 'baz'), array('priority' => 2, 'from' => 'bar', 'content' => 'qux')), 'id' => '123'), $catalogue->getMetadata('key', 'domain1'));
+ $this->assertEquals(
+ array(
+ 'notes' => array(
+ array('content' => 'baz'),
+ array('priority' => 2, 'from' => 'bar', 'content' => 'qux'),
+ ),
+ 'id' => '123',
+ 'file' => array(
+ 'original' => 'file.ext',
+ ),
+ ),
+ $catalogue->getMetadata('key', 'domain1')
+ );
}
public function testLoadVersion2()
@@ -257,4 +296,30 @@ public function testLoadVersion2WithMultiSegmentUnit()
$this->assertSame('processed', $metadata['notes'][0]['category']);
$this->assertSame('true', $metadata['notes'][0]['content']);
}
+
+ public function testLoadWithMultipleFileNodes()
+ {
+ $loader = new XliffFileLoader();
+ $catalogue = $loader->load(__DIR__.'/../fixtures/resources-multi-files.xlf', 'en', 'domain1');
+
+ $this->assertEquals(
+ array(
+ 'id' => '1',
+ 'file' => array(
+ 'original' => 'file.ext',
+ ),
+ ),
+ $catalogue->getMetadata('foo', 'domain1')
+ );
+ $this->assertEquals(
+ array(
+ 'notes' => array(array('content' => 'note')),
+ 'id' => '4',
+ 'file' => array(
+ 'original' => 'otherfile.ext',
+ ),
+ ),
+ $catalogue->getMetadata('test', 'domain1')
+ );
+ }
}
diff --git a/src/Symfony/Component/Translation/Tests/fixtures/resources-multi-files.xlf b/src/Symfony/Component/Translation/Tests/fixtures/resources-multi-files.xlf
new file mode 100644
index 0000000000000..5f451508bc8d8
--- /dev/null
+++ b/src/Symfony/Component/Translation/Tests/fixtures/resources-multi-files.xlf
@@ -0,0 +1,27 @@
+
+
+
+
+
+ foo
+ bar
+
+
+
+
+
+
+ extra
+
+
+ key
+
+
+ test
+ with
+ note
+
+
+
+
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy