Merge remote-tracking branch 'origin/AC-3226' into Spartans_2_4_6_Quality_Backlog

glo82145 · glo82145 · commit 6c62b133080e · 2022-08-26T13:29:55.000+05:30
diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Xml.php b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Xml.php
@@ -16,17 +16,22 @@
 class Xml extends AbstractAdapter
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _parse()
     {
-        foreach ($this->_getNodes($this->_file) as $element) {
+        foreach ($this->_getNodes($this->_file) as $key => $element) {
+
             if (!$element instanceof \SimpleXMLElement) {
                 continue;
             }
+
             $attributes = $element->attributes();
+
             if ((string)$attributes['translate'] === 'true' || (string)$attributes['translatable'] === 'true') {
                 $this->_addPhrase((string)$element);
+            } elseif ($key === 'title') {
+                $this->_addPhrase((string)$element->title);
             } else {
                 $this->parseTranslatableNodes($attributes, $element);
             }
@@ -44,8 +49,15 @@ protected function _getNodes($file)
         libxml_use_internal_errors(true);
         $xml = simplexml_load_file($file);
         libxml_use_internal_errors(false);
+
         if ($xml) {
             $nodes = $xml->xpath('//*[@translate|@translatable]');
+
+            /* To add title of all xml files in translation csv */
+            if ($xml->head) {
+                $nodes['title'] =  $xml->head;
+            }
+
             unset($xml);
 
             return is_array($nodes) ? $nodes : [];
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
@@ -60,6 +60,7 @@ public function parseDataProvider()
                     ['phrase' => 'Phrase 3', 'file' => $default, 'line' => '', 'quote' => ''],
                     ['phrase' => 'Phrase 1', 'file' => $default, 'line' => '', 'quote' => ''],
                     ['phrase' => 'Comment from new line.', 'file' => $default, 'line' => '', 'quote' => ''],
+                    ['phrase' => 'Title', '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
@@ -7,6 +7,9 @@
 -->
 
 <layout>
+    <head>
+        <title>Title</title>
+    </head>
     <node1 translate="description, label">
         <description>Phrase 1</description>
         <label>Phrase 2</label>

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ public function parseDataProvider()`
`60`	`60`	`['phrase' => 'Phrase 3', 'file' => $default, 'line' => '', 'quote' => ''],`
`61`	`61`	`['phrase' => 'Phrase 1', 'file' => $default, 'line' => '', 'quote' => ''],`
`62`	`62`	`['phrase' => 'Comment from new line.', 'file' => $default, 'line' => '', 'quote' => ''],`
	`63`	`+ ['phrase' => 'Title', 'file' => $default, 'line' => '', 'quote' => ''],`
`63`	`64`	`],`
`64`	`65`	`],`
`65`	`66`	`[`