MAGETWO-67048: Cannot add translate attribute into the di.xml

Author: nmalevanec

app/code/Magento/Analytics/i18n/en_US.csv

@@ -16,6 +16,7 @@
 "These arguments can't be empty ""%1""","These arguments can't be empty ""%1"""
 "Cannot find predefined integration user!","Cannot find predefined integration user!"
 "File is not ready yet.","File is not ready yet."
+"Your Base URL has been changed and your reports are being updated. Advanced Reporting will be available once this change has been processed. Please try again later.","Your Base URL has been changed and your reports are being updated. Advanced Reporting will be available once this change has been processed. Please try again later."
 "Failed to synchronize data to the Magento Business Intelligence service. ","Failed to synchronize data to the Magento Business Intelligence service. "
 "<a href=""%1"">Retry Synchronization</a>","<a href=""%1"">Retry Synchronization</a>"
 TestMessage,TestMessage
@@ -49,6 +50,24 @@ Industry,Industry
                     href=""https://dashboard.rjmetrics.com/v2/magento/signup/"">BI Essentials</a> tier.","Magento Business Intelligence provides you with a simple and clear path to
                     becoming more data driven.</br> Learn more about <a target=""_blank""
                     href=""https://dashboard.rjmetrics.com/v2/magento/signup/"">BI Essentials</a> tier."
+"Auto Parts","Auto Parts"
+"Baby/Children’s Apparel, Gear and Toys","Baby/Children’s Apparel, Gear and Toys"
+"Beauty and Cosmetics","Beauty and Cosmetics"
+"Books, Music and Magazines","Books, Music and Magazines"
+"Crafts and Stationery","Crafts and Stationery"
+"Consumer Electronics","Consumer Electronics"
+"Deal Site","Deal Site"
+"Fashion Apparel and Accessories","Fashion Apparel and Accessories"
+"Food, Beverage and Grocery","Food, Beverage and Grocery"
+"Home Goods and Furniture","Home Goods and Furniture"
+"Home Improvement","Home Improvement"
+"Jewelry and Watches","Jewelry and Watches"
+"Mass Merchant","Mass Merchant"
+"Office Supplies","Office Supplies"
+"Outdoor and Camping Gear","Outdoor and Camping Gear"
+"Pet Goods","Pet Goods"
+"Pharma and Medical Devices","Pharma and Medical Devices"
+"Technology B2B","Technology B2B"
 "Analytics Subscription","Analytics Subscription"
 "powered by Magento Business Intelligence","powered by Magento Business Intelligence"
 "<p>When you turn on Advanced

app/code/Magento/Catalog/Model/Entity/Product/Attribute/Design/Options/Container.php

@@ -24,7 +24,7 @@ public function getOptionText($value)
         if (sizeof($options) > 0) {
             foreach ($options as $option) {
                 if (isset($option['value']) && $option['value'] == $value) {
-                    return $option['label'];
+                    return __($option['label']);
                 }
             }
         }

app/code/Magento/Catalog/i18n/en_US.csv

@@ -210,6 +210,7 @@ Catalog,Catalog
 "An attribute with this code already exists.","An attribute with this code already exists."
 "An attribute with the same code (%1) already exists.","An attribute with the same code (%1) already exists."
 "The value of Admin must be unique.","The value of Admin must be unique."
+"The value of Admin scope can't be empty.","The value of Admin scope can't be empty."
 "You duplicated the product.","You duplicated the product."
 "This product doesn't exist.","This product doesn't exist."
 "Invalid product id. Should be numeric value greater than 0","Invalid product id. Should be numeric value greater than 0"
@@ -622,9 +623,13 @@ OK,OK
 "Image Detail","Image Detail"
 Adding...,Adding...
 Added,Added
+"does not implement Storage Interface","does not implement Storage Interface"
 "unselect all","unselect all"
 Inventory,Inventory
 "Catalog Section","Catalog Section"
+Small,Small
+Main,Main
+"Custom image","Custom image"
 "Product Fields Auto-Generation","Product Fields Auto-Generation"
 "Mask for SKU","Mask for SKU"
 "Use {{name}} as Product Name placeholder","Use {{name}} as Product Name placeholder"
@@ -633,6 +638,10 @@ Inventory,Inventory
 "Use {{name}} as Product Name or {{sku}} as Product SKU placeholders","Use {{name}} as Product Name or {{sku}} as Product SKU placeholders"
 "Mask for Meta Description","Mask for Meta Description"
 "Use {{name}} and {{description}} as Product Name and Product Description placeholders","Use {{name}} and {{description}} as Product Name and Product Description placeholders"
+"Recently Viewed/Compared Products","Recently Viewed/Compared Products"
+"Lifetime of products in Recently Viewed Widget","Lifetime of products in Recently Viewed Widget"
+"Lifetime of products in Recently Compared Widget","Lifetime of products in Recently Compared Widget"
+"Synchronize widget products with backend storage","Synchronize widget products with backend storage"
 Storefront,Storefront
 "List Mode","List Mode"
 "Products per Page on Grid Allowed Values","Products per Page on Grid Allowed Values"
@@ -666,6 +675,8 @@ Comma-separated.,Comma-separated.
 "Use Static URLs for Media Content in WYSIWYG for Catalog","Use Static URLs for Media Content in WYSIWYG for Catalog"
 "This applies only to catalog products and categories. Media content will be inserted into the editor as a static URL. Media content is not updated if the system configuration base URL changes.","This applies only to catalog products and categories. Media content will be inserted into the editor as a static URL. Media content is not updated if the system configuration base URL changes."
 "Top Level Category","Top Level Category"
+"Product Info Column","Product Info Column"
+"Block after Info Column","Block after Info Column"
 "Product Flat Data","Product Flat Data"
 "Reorganize EAV product structure to flat structure","Reorganize EAV product structure to flat structure"
 "Category Flat Data","Category Flat Data"
@@ -709,6 +720,22 @@ Template,Template
 "If empty, we'll use the category name here.","If empty, we'll use the category name here."
 "Category Link Block Template","Category Link Block Template"
 "Category Link Inline Template","Category Link Inline Template"
+"Recently Viewed Products","Recently Viewed Products"
+"List of Products Recently Viewed by Visitor","List of Products Recently Viewed by Visitor"
+"UI Component","UI Component"
+"Number of Products to display","Number of Products to display"
+"Product attributes to show","Product attributes to show"
+Image,Image
+"Learn More Link","Learn More Link"
+"Buttons to show","Buttons to show"
+"Add to Wishlist","Add to Wishlist"
+"Viewed Products Grid Template","Viewed Products Grid Template"
+"Viewed Products List Template","Viewed Products List Template"
+"Viewed Products Sidebar Template","Viewed Products Sidebar Template"
+"Recently Compared Products","Recently Compared Products"
+"List of Products Recently Compared by Visitor","List of Products Recently Compared by Visitor"
+"Compared Products Grid Template","Compared Products Grid Template"
+"Compared Products List Template","Compared Products List Template"
 Set,Set
 "Category Information","Category Information"
 "Enable Category","Enable Category"
@@ -763,3 +790,8 @@ Overview,Overview
 "Skip to the end of the images gallery","Skip to the end of the images gallery"
 "Skip to the beginning of the images gallery","Skip to the beginning of the images gallery"
 Details,Details
+"Recently Compared","Recently Compared"
+"Add To Cart","Add To Cart"
+"Add To Compare","Add To Compare"
+"Learn more","Learn more"
+"Recently Viewed","Recently Viewed"

app/code/Magento/Customer/Ui/Component/MassAction/Group/Options.php

@@ -88,7 +88,7 @@ public function jsonSerialize()
             foreach ($options as $optionCode) {
                 $this->options[$optionCode['value']] = [
                     'type' => 'customer_group_' . $optionCode['value'],
-                    'label' => $optionCode['label'],
+                    'label' => __($optionCode['label']),
                 ];
 
                 if ($this->urlPath && $this->paramName) {

app/code/Magento/Ui/etc/di.xml

@@ -256,7 +256,7 @@
                 <item name="array" xsi:type="object">arrayArgumentInterpreterProxy</item>
                 <item name="boolean" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\Boolean</item>
                 <item name="number" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\Number</item>
-                <item name="string" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\StringUtils</item>
+                <item name="string" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\TranslatableStringUtils</item>
                 <item name="null" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\NullType</item>
                 <item name="url" xsi:type="object">Magento\Ui\Config\Argument\Parser\Url</item>
             </argument>

app/etc/di.xml

@@ -394,7 +394,7 @@
                 <item name="array" xsi:type="object">layoutArrayArgumentReaderInterpreterProxy</item>
                 <item name="boolean" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\Boolean</item>
                 <item name="number" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\Number</item>
-                <item name="string" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\StringUtils</item>
+                <item name="string" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\TranslatableStringUtils</item>
                 <item name="null" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\NullType</item>
                 <item name="object" xsi:type="object">Magento\Framework\View\Layout\Argument\Interpreter\Passthrough</item>
                 <item name="url" xsi:type="object">Magento\Framework\View\Layout\Argument\Interpreter\Passthrough</item>
@@ -410,7 +410,7 @@
                 <item name="array" xsi:type="object">layoutArrayArgumentGeneratorInterpreterProxy</item>
                 <item name="boolean" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\Boolean</item>
                 <item name="number" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\Number</item>
-                <item name="string" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\StringUtils</item>
+                <item name="string" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\TranslatableStringUtils</item>
                 <item name="null" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\NullType</item>
                 <item name="object" xsi:type="object">layoutObjectArgumentInterpreter</item>
                 <item name="url" xsi:type="object">Magento\Framework\View\Layout\Argument\Interpreter\Url</item>
@@ -455,7 +455,7 @@
     </virtualType>
     <type name="Magento\Framework\View\Layout\Argument\Interpreter\NamedParams">
         <arguments>
-            <argument name="paramInterpreter" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\StringUtils</argument>
+            <argument name="paramInterpreter" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\TranslatableStringUtils</argument>
         </arguments>
     </type>
     <virtualType name="containerRenderPool" type="Magento\Framework\View\Layout\ReaderPool">

dev/tests/integration/testsuite/Magento/Framework/Data/Argument/Interpreter/StringUtilsTest.php

@@ -5,6 +5,12 @@
  */
 namespace Magento\Framework\Data\Argument\Interpreter;
 
+use Magento\Framework\Phrase\RendererInterface;
+use Magento\Framework\Stdlib\BooleanUtils;
+
+/**
+ * @covers StringUtils.
+ */
 class StringUtilsTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -13,13 +19,13 @@ class StringUtilsTest extends \PHPUnit_Framework_TestCase
     protected $_model;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var BooleanUtils|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $_booleanUtils;
 
     protected function setUp()
     {
-        $this->_booleanUtils = $this->getMock(\Magento\Framework\Stdlib\BooleanUtils::class);
+        $this->_booleanUtils = $this->getMock(BooleanUtils::class);
         $this->_booleanUtils->expects(
             $this->any()
         )->method(
@@ -28,18 +34,15 @@ protected function setUp()
             $this->returnValueMap([['true', true], ['false', false]])
         );
         $this->_model = new StringUtils($this->_booleanUtils);
-        $translateRenderer = $this->getMockForAbstractClass(\Magento\Framework\Phrase\RendererInterface::class);
-        $translateRenderer->expects($this->any())->method('render')->will(
-            $this->returnCallback(
-                function ($input) {
-                    return end($input) . ' (translated)';
-                }
-            )
-        );
+        /** @var RendererInterface|\PHPUnit_Framework_MockObject_MockObject $translateRenderer */
+        $translateRenderer = $this->getMockForAbstractClass(RendererInterface::class);
+        $translateRenderer->expects(self::never())->method('render');
         \Magento\Framework\Phrase::setRenderer($translateRenderer);
     }
 
     /**
+     * Check StringUtils::evaluate() won't translate incoming $input['value'].
+     *
      * @param array $input
      * @param bool $expected
      *
@@ -51,20 +54,27 @@ public function testEvaluate($input, $expected)
         $this->assertSame($expected, (string)$actual);
     }
 
+    /**
+     * Provide test data and expected results for testEavaluate().
+     *
+     * @return array
+     */
     public function evaluateDataProvider()
     {
         return [
             'no value' => [[], ''],
             'with value' => [['value' => 'some value'], 'some value'],
             'translation required' => [
                 ['value' => 'some value', 'translate' => 'true'],
-                'some value (translated)',
+                'some value',
             ],
             'translation not required' => [['value' => 'some value', 'translate' => 'false'], 'some value']
         ];
     }
 
     /**
+     * Check StringUtils::evaluate() trows exception in case $input['value'] not a string.
+     *
      * @param array $input
      *
      * @dataProvider evaluateExceptionDataProvider
@@ -76,6 +86,11 @@ public function testEvaluateException($input)
         $this->_model->evaluate($input);
     }
 
+    /**
+     * Provide test data for testEvaluateException.
+     *
+     * @return array
+     */
     public function evaluateExceptionDataProvider()
     {
         return ['not a string' => [['value' => 123]]];

dev/tests/integration/testsuite/Magento/Framework/Data/Argument/Interpreter/TranslatableStringUtilsTest.php

@@ -0,0 +1,109 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Data\Argument\Interpreter;
+
+use Magento\Framework\Phrase\RendererInterface;
+use Magento\Framework\Stdlib\BooleanUtils;
+
+/**
+ * @covers TranslatableStringUtils.
+ */
+class TranslatableStringUtilsTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Framework\Data\Argument\Interpreter\StringUtils
+     */
+    private $model;
+
+    /**
+     * @var BooleanUtils|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $booleanUtils;
+
+    /**
+     * Prepare subject for test.
+     */
+    protected function setUp()
+    {
+        $this->booleanUtils = $this->getMock(BooleanUtils::class);
+        $this->booleanUtils->expects(
+            $this->any()
+        )->method(
+            'toBoolean'
+        )->will(
+            $this->returnValueMap([['true', true], ['false', false]])
+        );
+
+        $baseStringUtils = new StringUtils($this->booleanUtils);
+        $this->model = new TranslatableStringUtils($this->booleanUtils, $baseStringUtils);
+        /** @var RendererInterface|\PHPUnit_Framework_MockObject_MockObject $translateRenderer */
+        $translateRenderer = $this->getMockForAbstractClass(RendererInterface::class);
+        $translateRenderer->expects($this->any())->method('render')->will(
+            $this->returnCallback(
+                function ($input) {
+                    return end($input) . ' (translated)';
+                }
+            )
+        );
+        \Magento\Framework\Phrase::setRenderer($translateRenderer);
+    }
+
+    /**
+     * Check TranslatableStringUtils::evaluate can translate incoming $input['value'].
+     *
+     * @param array $input
+     * @param bool $expected
+     *
+     * @dataProvider evaluateDataProvider
+     */
+    public function testEvaluate($input, $expected)
+    {
+        $actual = $this->model->evaluate($input);
+        $this->assertSame($expected, (string)$actual);
+    }
+
+    /**
+     * Provide test data and expected results for testEvaluate().
+     *
+     * @return array
+     */
+    public function evaluateDataProvider()
+    {
+        return [
+            'no value' => [[], ''],
+            'with value' => [['value' => 'some value'], 'some value'],
+            'translation required' => [
+                ['value' => 'some value', 'translate' => 'true'],
+                'some value (translated)',
+            ],
+            'translation not required' => [['value' => 'some value', 'translate' => 'false'], 'some value']
+        ];
+    }
+
+    /**
+     * Check TranslatableStringUtils::evaluate() throws exception in case $input['value'] is not a string.
+     *
+     * @param array $input
+     *
+     * @dataProvider evaluateExceptionDataProvider
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage String value is expected
+     */
+    public function testEvaluateException($input)
+    {
+        $this->model->evaluate($input);
+    }
+
+    /**
+     * Provide test data for testEvaluateException.
+     *
+     * @return array
+     */
+    public function evaluateExceptionDataProvider()
+    {
+        return ['not a string' => [['value' => 123]]];
+    }
+}

lib/internal/Magento/Framework/App/ObjectManagerFactory.php

@@ -225,7 +225,7 @@ protected function createArgumentInterpreter(
         $result = new \Magento\Framework\Data\Argument\Interpreter\Composite(
             [
                 'boolean' => new \Magento\Framework\Data\Argument\Interpreter\Boolean($booleanUtils),
-                'string' => new \Magento\Framework\Data\Argument\Interpreter\StringUtils($booleanUtils, false),
+                'string' => new \Magento\Framework\Data\Argument\Interpreter\StringUtils($booleanUtils),
                 'number' => new \Magento\Framework\Data\Argument\Interpreter\Number(),
                 'null' => new \Magento\Framework\Data\Argument\Interpreter\NullType(),
                 'object' => new \Magento\Framework\Data\Argument\Interpreter\DataObject($booleanUtils),