Merge pull request #540 from goetas/approved-translations

test translation state is preserved for xliff
schmittjoh · Apr 21, 2020 · a94d149 · a94d149
2 parents b77674d + 745b3f2
commit a94d149
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 2 deletions.
diff --git a/Model/Message.php b/Model/Message.php
@@ -100,7 +100,7 @@ public static function forThisFile($id, $domain = 'messages')
      * @param string $id
      * @param string $domain
      *
-     * @return Message
+     * @return static
      *
      * @static
      */

diff --git a/Tests/Translation/Loader/Symfony/xliff/workflow.xml b/Tests/Translation/Loader/Symfony/xliff/workflow.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+  <file source-language="en" target-language="" datatype="plaintext" original="not.available" tool="JMSTranslationBundle">
+    <header>
+      <note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
+    </header>
+    <body>
+      <trans-unit id="1" approved="yes">
+        <source>foo1</source>
+        <target state="needs-adaptation">bar</target>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/Tests/Translation/Loader/XliffLoaderTest.php b/Tests/Translation/Loader/XliffLoaderTest.php
@@ -21,6 +21,7 @@
 namespace JMS\TranslationBundle\Tests\Translation\Loader;
 
 use JMS\TranslationBundle\Model\Message\XliffMessage;
+use JMS\TranslationBundle\Model\Message\XliffMessageState;
 use JMS\TranslationBundle\Model\MessageCatalogue;
 use JMS\TranslationBundle\Translation\Dumper\XliffDumper;
 use JMS\TranslationBundle\Translation\Loader\XliffLoader;
@@ -63,6 +64,24 @@ public function testLoadWithSymfonyFormat()
         );
     }
 
+    public function testWorkflowAttributes()
+    {
+        $loader = new XliffLoader();
+
+        $expected = new MessageCatalogue();
+        $expected->setLocale('en');
+        $expected->add(XliffMessage::create('foo1')
+            ->setDesc('foo1')
+            ->setLocaleString('bar')
+            ->setState(XliffMessageState::STATE_NEEDS_ADAPTATION)
+            ->setApproved(true));
+
+        $this->assertEquals(
+            $expected,
+            $loader->load(__DIR__ . '/Symfony/xliff/workflow.xml', 'en')
+        );
+    }
+
     public function getTestFiles()
     {
         $files   = [];

diff --git a/Translation/Loader/XliffLoader.php b/Translation/Loader/XliffLoader.php
@@ -64,7 +64,7 @@ public function load($resource, $locale, $domain = 'messages')
                     ->setLocaleString((string) $trans->target);
             \assert($m instanceof Message);
 
-            $m->setApproved($trans['approved']==='yes');
+            $m->setApproved((string) $trans['approved']==='yes');
 
             if (isset($trans->target['state'])) {
                 $m->setState((string) $trans->target['state']);