fix xliff file dumper

php-translation · Jan 28, 2017 · 1e38274 · 1e38274
1 parent 439892b
commit 1e38274
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/Bridge/Symfony/DependencyInjection/TranslationAdapterPhraseAppExtension.php b/src/Bridge/Symfony/DependencyInjection/TranslationAdapterPhraseAppExtension.php
@@ -25,7 +25,6 @@ public function load(array $configs, ContainerBuilder $container)
         $configuration = new Configuration($container);
         $config = $this->processConfiguration($configuration, $configs);
 
-        // this can be removed, as soon as https://github.com/symfony/symfony/pull/21442 is merged
         $container->setParameter('translation.dumper.xliff.class', XliffFileDumper::class);
 
         $requestBuilder = (new Definition(RequestBuilder::class))
@@ -36,7 +35,7 @@ public function load(array $configs, ContainerBuilder $container)
             ->addArgument(new Reference($config['httplug_client']))
             ->addArgument(new Reference($config['httplug_uri_factory']));
 
-        $apiDef = $container->register('php_translation.adapter.loco.raw');
+        $apiDef = $container->register('php_translation.adapter.phrase_app.raw');
         $apiDef->setClass(PhraseAppClient::class)
             ->setFactory([PhraseAppClient::class, 'configure'])
             ->addArgument($clientConfigurator)

diff --git a/src/Bridge/Symfony/XliffFileDumper.php b/src/Bridge/Symfony/XliffFileDumper.php
@@ -88,10 +88,10 @@ private function dumpXliff1($defaultLocale, MessageCatalogue $messages, $domain,
 
             // changed for phrase app
             $translation->setAttribute('id', md5($source));
-            $translation->setAttribute('resname', $source);
+            $translation->setAttribute('resname', "$domain::$source");
 
             $s = $translation->appendChild($dom->createElement('source'));
-            $s->appendChild($dom->createTextNode("$domain::$source"));
+            $s->appendChild($dom->createTextNode($source));
 
             // Does the target contain characters requiring a CDATA section?
             $text = 1 === preg_match('/[&<>]/', $target) ? $dom->createCDATASection($target) : $dom->createTextNode($target);
@@ -152,7 +152,7 @@ private function dumpXliff2($defaultLocale, MessageCatalogue $messages, $domain,
             $segment = $translation->appendChild($dom->createElement('segment'));
 
             $s = $segment->appendChild($dom->createElement('source'));
-            $s->appendChild($dom->createTextNode("$domain::$source"));
+            $s->appendChild($dom->createTextNode($source));
 
             // Does the target contain characters requiring a CDATA section?
             $text = 1 === preg_match('/[&<>]/', $target) ? $dom->createCDATASection($target) : $dom->createTextNode($target);