MAGETWO-31956: PR for S42

 - Refactored usages of __() method in lib to use new \Magento\Framework\Phrase()

Author: marcozheng

lib/internal/Magento/Framework/View/Model/Layout/Merge.php

@@ -381,7 +381,7 @@ public function getAllDesignAbstractions()
             $name = $node->getAttribute('id');
             $info = [
                 'name' => $name,
-                'label' => __((string)$node->getAttribute('label')),
+                'label' => (string)new \Magento\Framework\Phrase((string)$node->getAttribute('label')),
                 'design_abstraction' => $node->getAttribute('design_abstraction'),
             ];
             $result[$name] = $info;
@@ -780,7 +780,7 @@ public function getContainers()
         foreach ($containerNodes as $oneContainerNode) {
             $label = $oneContainerNode->getAttribute('label');
             if ($label) {
-                $result[$oneContainerNode->getAttribute('name')] = __($label);
+                $result[$oneContainerNode->getAttribute('name')] = (string)new \Magento\Framework\Phrase($label);
             }
         }
         return $result;

lib/internal/Magento/Framework/View/Model/Layout/Translator.php

@@ -126,6 +126,6 @@ protected function _getNodeValue(Element $node)
      */
     protected function _translateValue($value)
     {
-        return __($value);
+        return (string)new \Magento\Framework\Phrase($value);
     }
 }

lib/internal/Magento/Framework/View/Model/Layout/Update/Validator.php

@@ -82,9 +82,9 @@ protected function _initMessageTemplates()
     {
         if (!$this->_messageTemplates) {
             $this->_messageTemplates = [
-                self::HELPER_ARGUMENT_TYPE => __('Helper arguments should not be used in custom layout updates.'),
-                self::UPDATER_MODEL => __('Updater model should not be used in custom layout updates.'),
-                self::XML_INVALID => __('Please correct the XML data and try again. %value%'),
+                self::HELPER_ARGUMENT_TYPE => (string)new \Magento\Framework\Phrase('Helper arguments should not be used in custom layout updates.'),
+                self::UPDATER_MODEL => (string)new \Magento\Framework\Phrase('Updater model should not be used in custom layout updates.'),
+                self::XML_INVALID => (string)new \Magento\Framework\Phrase('Please correct the XML data and try again. %value%'),
             ];
         }
         return $this;