bug #29308 [Translation] Use XLIFF source rather than resname when there's no target (thewilkybarkid)

fabpot · fabpot · commit c0bfdeb5c5c9 · 2018-11-26T08:01:16.000+01:00
This PR was merged into the 2.8 branch. Discussion ---------- [Translation] Use XLIFF source rather than resname when there's no target | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Relates to #20076 (comment). If there's no `<target>` in an XLIFF but there is a `@resname` then that's used rather than the `<source>`. If I'm using translation keys and my source locale is `en`, then it's a bit redundant to duplicate the `<source>` in the `<target>` in the `en` file (since there is no translation). This isn't changing the behaviour when `<target>` is present but empty. (Caveat: I'm definitely not an expert on XLIFF.) Commits ------- 8633ebb Use XLIFF source rather than resname when there's no target
diff --git a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
@@ -90,7 +90,7 @@ private function extractXliff1(\DOMDocument $dom, MessageCatalogue $catalogue, $
             $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 : $source), $encoding);
+            $target = $this->utf8ToCharset((string) (isset($translation->target) ? $translation->target : $translation->source), $encoding);
 
             $catalogue->set((string) $source, $target, $domain);
 
diff --git a/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
@@ -66,7 +66,7 @@ public function testLoadWithResname()
         $loader = new XliffFileLoader();
         $catalogue = $loader->load(__DIR__.'/../fixtures/resname.xlf', 'en', 'domain1');
 
-        $this->assertEquals(array('foo' => 'bar', 'bar' => 'baz', 'baz' => 'foo'), $catalogue->all('domain1'));
+        $this->assertEquals(array('foo' => 'bar', 'bar' => 'baz', 'baz' => 'foo', 'qux' => 'qux source'), $catalogue->all('domain1'));
     }
 
     public function testIncompleteResource()
diff --git a/src/Symfony/Component/Translation/Tests/fixtures/resname.xlf b/src/Symfony/Component/Translation/Tests/fixtures/resname.xlf
@@ -14,6 +14,9 @@
         <source>baz</source>
         <target>foo</target>
       </trans-unit>
+      <trans-unit id="4" resname="qux">
+        <source>qux source</source>
+      </trans-unit>
     </body>
   </file>
 </xliff>

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function testLoadWithResname()`
`66`	`66`	`$loader = new XliffFileLoader();`
`67`	`67`	`$catalogue = $loader->load(__DIR__.'/../fixtures/resname.xlf', 'en', 'domain1');`
`68`	`68`
`69`		`- $this->assertEquals(array('foo' => 'bar', 'bar' => 'baz', 'baz' => 'foo'), $catalogue->all('domain1'));`
	`69`	`+ $this->assertEquals(array('foo' => 'bar', 'bar' => 'baz', 'baz' => 'foo', 'qux' => 'qux source'), $catalogue->all('domain1'));`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`public function testIncompleteResource()`