Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit e76d369

Browse files
nmalevanecnmalevanec
committed
MAGETWO-67048: Cannot add translate attribute into the di.xml
1 parent 47361f8 commit e76d369

File tree

18 files changed

+120
-201
lines changed

18 files changed

+120
-201
lines changed

‎app/code/Magento/Analytics/etc/di.xml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -181,28 +181,28 @@
181181
<type name="Magento\Analytics\Model\Config\Source\Vertical">
182182
<arguments>
183183
<argument name="verticals" xsi:type="array">
184-
<item name="0" xsi:type="string">Apps and Games</item>
185-
<item name="1" xsi:type="string">Athletic/Sporting Goods</item>
186-
<item name="2" xsi:type="string">Art and Design</item>
187-
<item name="3" xsi:type="string">Auto Parts</item>
188-
<item name="4" xsi:type="string">Baby/Children’s Apparel, Gear and Toys</item>
189-
<item name="5" xsi:type="string">Beauty and Cosmetics</item>
190-
<item name="6" xsi:type="string">Books, Music and Magazines</item>
191-
<item name="7" xsi:type="string">Crafts and Stationery</item>
192-
<item name="8" xsi:type="string">Consumer Electronics</item>
193-
<item name="9" xsi:type="string">Deal Site</item>
194-
<item name="10" xsi:type="string">Fashion Apparel and Accessories</item>
195-
<item name="11" xsi:type="string">Food, Beverage and Grocery</item>
196-
<item name="12" xsi:type="string">Home Goods and Furniture</item>
197-
<item name="13" xsi:type="string">Home Improvement</item>
198-
<item name="14" xsi:type="string">Jewelry and Watches</item>
199-
<item name="15" xsi:type="string">Mass Merchant</item>
200-
<item name="16" xsi:type="string">Office Supplies</item>
201-
<item name="17" xsi:type="string">Outdoor and Camping Gear</item>
202-
<item name="18" xsi:type="string">Pet Goods</item>
203-
<item name="19" xsi:type="string">Pharma and Medical Devices</item>
204-
<item name="20" xsi:type="string">Technology B2B</item>
205-
<item name="21" xsi:type="string">Other</item>
184+
<item name="0" xsi:type="string" translatable="true">Apps and Games</item>
185+
<item name="1" xsi:type="string" translatable="true">Athletic/Sporting Goods</item>
186+
<item name="2" xsi:type="string" translatable="true">Art and Design</item>
187+
<item name="3" xsi:type="string" translatable="true">Auto Parts</item>
188+
<item name="4" xsi:type="string" translatable="true">Baby/Children’s Apparel, Gear and Toys</item>
189+
<item name="5" xsi:type="string" translatable="true">Beauty and Cosmetics</item>
190+
<item name="6" xsi:type="string" translatable="true">Books, Music and Magazines</item>
191+
<item name="7" xsi:type="string" translatable="true">Crafts and Stationery</item>
192+
<item name="8" xsi:type="string" translatable="true">Consumer Electronics</item>
193+
<item name="9" xsi:type="string" translatable="true">Deal Site</item>
194+
<item name="10" xsi:type="string" translatable="true">Fashion Apparel and Accessories</item>
195+
<item name="11" xsi:type="string" translatable="true">Food, Beverage and Grocery</item>
196+
<item name="12" xsi:type="string" translatable="true">Home Goods and Furniture</item>
197+
<item name="13" xsi:type="string" translatable="true">Home Improvement</item>
198+
<item name="14" xsi:type="string" translatable="true">Jewelry and Watches</item>
199+
<item name="15" xsi:type="string" translatable="true">Mass Merchant</item>
200+
<item name="16" xsi:type="string" translatable="true">Office Supplies</item>
201+
<item name="17" xsi:type="string" translatable="true">Outdoor and Camping Gear</item>
202+
<item name="18" xsi:type="string" translatable="true">Pet Goods</item>
203+
<item name="19" xsi:type="string" translatable="true">Pharma and Medical Devices</item>
204+
<item name="20" xsi:type="string" translatable="true">Technology B2B</item>
205+
<item name="21" xsi:type="string" translatable="true">Other</item>
206206
</argument>
207207
</arguments>
208208
</type>

‎app/code/Magento/Catalog/etc/adminhtml/di.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@
2020
<arguments>
2121
<argument name="imageTypes" xsi:type="array">
2222
<item name="small" xsi:type="array">
23-
<item name="title" xsi:type="string">Small</item>
23+
<item name="title" xsi:type="string" translatable="true">Small</item>
2424
<item name="attribute" xsi:type="string">small_image</item>
2525
</item>
2626
<item name="main" xsi:type="array">
27-
<item name="title" xsi:type="string">Main</item>
27+
<item name="title" xsi:type="string" translatable="true">Main</item>
2828
<item name="attribute" xsi:type="string">image</item>
2929
</item>
3030
<item name="cart" xsi:type="array">
31-
<item name="title" xsi:type="string">Thumbnail</item>
31+
<item name="title" xsi:type="string" translatable="true">Thumbnail</item>
3232
<item name="attribute" xsi:type="string">thumbnail</item>
3333
</item>
3434
<item name="custom" xsi:type="array">
35-
<item name="title" xsi:type="string">Custom image</item>
35+
<item name="title" xsi:type="string" translatable="true">Custom image</item>
3636
<item name="attribute" xsi:type="string">custom_image</item>
3737
</item>
3838
</argument>

‎app/code/Magento/Catalog/etc/di.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,11 @@
144144
<argument name="options" xsi:type="array">
145145
<item name="option1" xsi:type="array">
146146
<item name="value" xsi:type="string">container1</item>
147-
<item name="label" xsi:type="string">Product Info Column</item>
147+
<item name="label" xsi:type="string" translatable="true">Product Info Column</item>
148148
</item>
149149
<item name="option2" xsi:type="array">
150150
<item name="value" xsi:type="string">container2</item>
151-
<item name="label" xsi:type="string">Block after Info Column</item>
151+
<item name="label" xsi:type="string" translatable="true">Block after Info Column</item>
152152
</item>
153153
</argument>
154154
</arguments>

‎app/code/Magento/Customer/etc/di.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -396,8 +396,8 @@
396396
<item name="urlPath" xsi:type="string">customer/index/massAssignGroup</item>
397397
<item name="paramName" xsi:type="string">group</item>
398398
<item name="confirm" xsi:type="array">
399-
<item name="title" xsi:type="string">Assign a Customer Group</item>
400-
<item name="message" xsi:type="string">Are you sure to assign selected customers to new group?</item>
399+
<item name="title" xsi:type="string" translatable="true">Assign a Customer Group</item>
400+
<item name="message" xsi:type="string" translatable="true">Are you sure to assign selected customers to new group?</item>
401401
</item>
402402
</argument>
403403
</arguments>

‎app/code/Magento/Directory/etc/di.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
<arguments>
1212
<argument name="servicesConfig" xsi:type="array">
1313
<item name="yahoofinance" xsi:type="array">
14-
<item name="label" xsi:type="string">Yahoo Finance Exchange</item>
14+
<item name="label" xsi:type="string" translatable="true">Yahoo Finance Exchange</item>
1515
<item name="class" xsi:type="string">Magento\Directory\Model\Currency\Import\YahooFinance</item>
1616
</item>
1717
<item name="webservicex" xsi:type="array">
18-
<item name="label" xsi:type="string">Webservicex</item>
18+
<item name="label" xsi:type="string" translatable="true">Webservicex</item>
1919
<item name="class" xsi:type="string">Magento\Directory\Model\Currency\Import\Webservicex</item>
2020
</item>
2121
<item name="fixerio" xsi:type="array">
22-
<item name="label" xsi:type="string">Fixer.io</item>
22+
<item name="label" xsi:type="string" translatable="true">Fixer.io</item>
2323
<item name="class" xsi:type="string">Magento\Directory\Model\Currency\Import\FixerIo</item>
2424
</item>
2525
</argument>

‎dev/tests/integration/testsuite/Magento/Framework/ObjectManager/Config/Reader/DomTest.php

Lines changed: 2 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,8 @@ protected function setUp()
6363
false
6464
);
6565
$this->_fileResolverMock->expects($this->once())->method('get')->will($this->returnValue($this->_fileList));
66-
$this->_mapper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
67-
\Magento\Framework\ObjectManager\Config\Mapper\Dom::class,
68-
['argumentInterpreter' => $this->getArgumentInterpreterWithMockedStringUtils()]
66+
$this->_mapper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
67+
\Magento\Framework\ObjectManager\Config\Mapper\Dom::class
6968
);
7069
$this->_validationState = new \Magento\Framework\App\Arguments\ValidationState(
7170
\Magento\Framework\App\State::MODE_DEFAULT
@@ -86,47 +85,4 @@ public function testRead()
8685
);
8786
$this->assertEquals($this->_mapper->convert($this->_mergedConfig), $model->read('scope'));
8887
}
89-
90-
/**
91-
* Replace Magento\Framework\Data\Argument\Interpreter\StringUtils with mock to check arguments wasn't translated.
92-
*
93-
* Check argument $data has not key $data['translate'], therefore
94-
* Magento\Framework\Data\Argument\Interpreter\StringUtils::evaluate($data) won't translate $data['value'].
95-
*
96-
* @return \Magento\Framework\Data\Argument\Interpreter\Composite
97-
*/
98-
private function getArgumentInterpreterWithMockedStringUtils()
99-
{
100-
$booleanUtils = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
101-
\Magento\Framework\Stdlib\BooleanUtils::class
102-
);
103-
$stringUtilsMock = $this->getMockBuilder(\Magento\Framework\Data\Argument\Interpreter\StringUtils::class)
104-
->setConstructorArgs(['booleanUtils' => $booleanUtils])
105-
->setMethods(['evaluate'])
106-
->getMock();
107-
$stringUtilsMock->expects($this->any())
108-
->method('evaluate')
109-
->with(self::callback(function ($data) {
110-
return !isset($data['translate']);
111-
}))
112-
->will(self::returnCallback(function ($data) {
113-
return isset($data['value']) ? $data['value'] : '';
114-
}));
115-
$constInterpreter = new \Magento\Framework\Data\Argument\Interpreter\Constant();
116-
$composite = new \Magento\Framework\Data\Argument\Interpreter\Composite(
117-
[
118-
'boolean' => new \Magento\Framework\Data\Argument\Interpreter\Boolean($booleanUtils),
119-
'string' => $stringUtilsMock,
120-
'number' => new \Magento\Framework\Data\Argument\Interpreter\Number(),
121-
'null' => new \Magento\Framework\Data\Argument\Interpreter\NullType(),
122-
'object' => new \Magento\Framework\Data\Argument\Interpreter\DataObject($booleanUtils),
123-
'const' => $constInterpreter,
124-
'init_parameter' => new \Magento\Framework\App\Arguments\ArgumentInterpreter($constInterpreter),
125-
],
126-
\Magento\Framework\ObjectManager\Config\Reader\Dom::TYPE_ATTRIBUTE
127-
);
128-
$composite->addInterpreter('array', new \Magento\Framework\Data\Argument\Interpreter\ArrayType($composite));
129-
130-
return $composite;
131-
}
13288
}

‎dev/tests/integration/testsuite/Magento/Framework/ObjectManager/_files/config_one.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<item name="boolZero" xsi:type="boolean">false</item>
2020
<item name="intValue" xsi:type="number">100500</item>
2121
<item name="nullValue" xsi:type="null"/>
22-
<item name="stringPattern" xsi:type="string" translate="true">az-value</item>
22+
<item name="stringPattern" xsi:type="string">az-value</item>
2323
</argument>
2424
<argument name="constParam" xsi:type="const">Magento\Store\Model\Website::CACHE_TAG</argument>
2525
<argument name="boolFalseParam" xsi:type="boolean">false</argument>
@@ -28,7 +28,7 @@
2828
<argument name="boolZeroParam" xsi:type="boolean">false</argument>
2929
<argument name="intValueParam" xsi:type="number">100500</argument>
3030
<argument name="nullValueParam" xsi:type="null"/>
31-
<argument name="stringPatternParam" xsi:type="string" translate="true">az-value</argument>
31+
<argument name="stringPatternParam" xsi:type="string">az-value</argument>
3232
</arguments>
3333
</type>
3434
</config>

‎dev/tests/integration/testsuite/Magento/Framework/ObjectManager/_files/config_two.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<item name="boolTrue" xsi:type="number">10</item>
1717
<item name="boolOne" xsi:type="string">1</item>
1818
<item name="boolZero" xsi:type="boolean">false</item>
19-
<item name="stringPattern" xsi:type="string" translate="true">Az-Value</item>
19+
<item name="stringPattern" xsi:type="string">Az-Value</item>
2020
</argument>
2121
<argument name="constParam" xsi:type="const">Magento\Store\Model\Website::CACHE_TAG</argument>
2222
<argument name="boolFalseParam" xsi:type="number">100</argument>

‎dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/expectedPhrases.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@
1818
"string with escaped ""double quotes""","string with escaped ""double quotes"""
1919
"string with placeholder in escaped double quotes ""%1""","string with placeholder in escaped double quotes ""%1"""
2020
"string that's got an unclosed single quote in it","string that's got an unclosed single quote in it"
21+
"Test di text","Test di text"

‎dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/phrases/test_di.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
9+
<type name="TestName">
10+
<arguments>
11+
<argument name="test" xsi:type="array">
12+
<item name="test" xsi:type="string" translatable="true">Test di text</item>
13+
</argument>
14+
</arguments>
15+
</type>
16+
</config>

0 commit comments

Comments
 (0)