MAGETWO-82650: MAGETWO-77673: <![CDATA[]]>in system.xml translate phrase not work, if comment starts from new line[port from 2.2-develop] #11679

Oleksii Korshenko · web-flow · commit 69e06c4729f3 · 2017-10-24T20:50:07.000-05:00
diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Xml.php b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Xml.php
@@ -65,7 +65,7 @@ private function parseTranslatableNodes(\SimpleXMLElement $attributes, \SimpleXM
     {
         $nodesDelimiter = strpos($attributes['translate'], ' ') === false ? ',' : ' ';
         foreach (explode($nodesDelimiter, $attributes['translate']) as $value) {
-            $phrase = (string)$element->{$value};
+            $phrase = trim((string)$element->{$value});
             if ($phrase) {
                 $this->_addPhrase($phrase);
             }
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/Adapter/XmlTest.php b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/Adapter/XmlTest.php
@@ -53,6 +53,7 @@ public function parseDataProvider()
                     ['phrase' => 'Phrase 2', 'file' => $default, 'line' => '', 'quote' => ''],
                     ['phrase' => 'Phrase 3', 'file' => $default, 'line' => '', 'quote' => ''],
                     ['phrase' => 'Phrase 1', 'file' => $default, 'line' => '', 'quote' => ''],
+                    ['phrase' => 'Comment from new line.', 'file' => $default, 'line' => '', 'quote' => ''],
                 ],
             ],
             [
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/Adapter/_files/default.xml b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/Adapter/_files/default.xml
@@ -15,4 +15,9 @@
     <node2>
         <title translate="true">Phrase 1</title>
     </node2>
+    <node3 translate="comment">
+        <comment>
+            <![CDATA[Comment from new line.]]>
+        </comment>
+    </node3>
 </layout>

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ private function parseTranslatableNodes(\SimpleXMLElement $attributes, \SimpleXM`
`65`	`65`	`{`
`66`	`66`	`$nodesDelimiter = strpos($attributes['translate'], ' ') === false ? ',' : ' ';`
`67`	`67`	`foreach (explode($nodesDelimiter, $attributes['translate']) as $value) {`
`68`		`- $phrase = (string)$element->{$value};`
	`68`	`+ $phrase = trim((string)$element->{$value});`
`69`	`69`	`if ($phrase) {`
`70`	`70`	`$this->_addPhrase($phrase);`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ public function parseDataProvider()`
`53`	`53`	`['phrase' => 'Phrase 2', 'file' => $default, 'line' => '', 'quote' => ''],`
`54`	`54`	`['phrase' => 'Phrase 3', 'file' => $default, 'line' => '', 'quote' => ''],`
`55`	`55`	`['phrase' => 'Phrase 1', 'file' => $default, 'line' => '', 'quote' => ''],`
	`56`	`+ ['phrase' => 'Comment from new line.', 'file' => $default, 'line' => '', 'quote' => ''],`
`56`	`57`	`],`
`57`	`58`	`],`
`58`	`59`	`[`