bug #54564 [Translation] Skip state=needs-translation entries only when source == target (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit dc7b54ddfb37 · 2024-04-12T13:44:56.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Translation] Skip state=needs-translation entries only when source == target | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #54541 | License | MIT Commits ------- 155d23f [Translation] Skip state=needs-translation entries only when source == target
diff --git a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
@@ -111,16 +111,20 @@ private function extractXliff1(\DOMDocument $dom, MessageCatalogue $catalogue, s
                     continue;
                 }
 
-                if (isset($translation->target) && 'needs-translation' === (string) $translation->target->attributes()['state']) {
+                $source = (string) (isset($attributes['resname']) && $attributes['resname'] ? $attributes['resname'] : $translation->source);
+
+                if (isset($translation->target)
+                    && 'needs-translation' === (string) $translation->target->attributes()['state']
+                    && \in_array((string) $translation->target, [$source, (string) $translation->source], true)
+                ) {
                     continue;
                 }
 
-                $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);
+                $catalogue->set($source, $target, $domain);
 
                 $metadata = [
                     'source' => (string) $translation->source,
@@ -143,7 +147,7 @@ private function extractXliff1(\DOMDocument $dom, MessageCatalogue $catalogue, s
                     $metadata['id'] = (string) $attributes['id'];
                 }
 
-                $catalogue->setMetadata((string) $source, $metadata, $domain);
+                $catalogue->setMetadata($source, $metadata, $domain);
             }
         }
     }
diff --git a/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
@@ -52,9 +52,17 @@ public function testLoadRawXliff()
       </trans-unit>
       <trans-unit id="4">
         <source>test</source>
-        <target>with</target>
+        <target state="needs-translation">with</target>
         <note>note</note>
       </trans-unit>
+      <trans-unit id="5">
+        <source>baz</source>
+        <target state="needs-translation">baz</target>
+      </trans-unit>
+      <trans-unit id="6" resname="buz">
+        <source>baz</source>
+        <target state="needs-translation">buz</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
@@ -65,6 +73,7 @@ public function testLoadRawXliff()
         $this->assertEquals('en', $catalogue->getLocale());
         $this->assertSame([], libxml_get_errors());
         $this->assertContainsOnly('string', $catalogue->all('domain1'));
+        $this->assertSame(['foo', 'extra', 'key', 'test'], array_keys($catalogue->all('domain1')));
     }
 
     public function testLoadWithInternalErrorsEnabled()

Original file line number	Diff line number	Diff line change
`@@ -111,16 +111,20 @@ private function extractXliff1(\DOMDocument $dom, MessageCatalogue $catalogue, s`
`111`	`111`	`continue;`
`112`	`112`	`}`
`113`	`113`
`114`		`- if (isset($translation->target) && 'needs-translation' === (string) $translation->target->attributes()['state']) {`
	`114`	`+ $source = (string) (isset($attributes['resname']) && $attributes['resname'] ? $attributes['resname'] : $translation->source);`
	`115`	`+`
	`116`	`+ if (isset($translation->target)`
	`117`	`+ && 'needs-translation' === (string) $translation->target->attributes()['state']`
	`118`	`+ && \in_array((string) $translation->target, [$source, (string) $translation->source], true)`
	`119`	`+ ) {`
`115`	`120`	`continue;`
`116`	`121`	`}`
`117`	`122`
`118`		`- $source = isset($attributes['resname']) && $attributes['resname'] ? $attributes['resname'] : $translation->source;`
`119`	`123`	`// If the xlf file has another encoding specified, try to convert it because`
`120`	`124`	`// simple_xml will always return utf-8 encoded values`
`121`	`125`	`$target = $this->utf8ToCharset((string) ($translation->target ?? $translation->source), $encoding);`
`122`	`126`
`123`		`- $catalogue->set((string) $source, $target, $domain);`
	`127`	`+ $catalogue->set($source, $target, $domain);`
`124`	`128`
`125`	`129`	`$metadata = [`
`126`	`130`	`'source' => (string) $translation->source,`
`@@ -143,7 +147,7 @@ private function extractXliff1(\DOMDocument $dom, MessageCatalogue $catalogue, s`
`143`	`147`	`$metadata['id'] = (string) $attributes['id'];`
`144`	`148`	`}`
`145`	`149`
`146`		`- $catalogue->setMetadata((string) $source, $metadata, $domain);`
	`150`	`+ $catalogue->setMetadata($source, $metadata, $domain);`
`147`	`151`	`}`
`148`	`152`	`}`
`149`	`153`	`}`