From c451532080cc7b9dd13bebf8088aabf5592db339 Mon Sep 17 00:00:00 2001
From: magento-engcom-team <mikola.malevanec@transoftgroup.com>
Date: Tue, 24 Oct 2017 11:49:27 +0300
Subject: [PATCH] MAGETWO-77673: <![CDATA[]]>in system.xml translate phrase not
 work, if comment starts from new line[port from 2.2-develop].

---
 setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Xml.php   | 2 +-
 .../Setup/Test/Unit/Module/I18n/Parser/Adapter/XmlTest.php   | 1 +
 .../Test/Unit/Module/I18n/Parser/Adapter/_files/default.xml  | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Xml.php b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Xml.php
index a0868d9f08566..dd87fa4b2aea2 100644
--- 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
index 1a052ba8c3233..842a2a8d8f2cc 100644
--- 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
index 77edb3881e0c5..510ff16abc6ef 100644
--- 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>