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

Author: nmalevanec

app/code/Magento/Ui/etc/ui_definition.map.xsd

@@ -7,14 +7,6 @@
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
     <xs:redefine schemaLocation="urn:magento:framework:Data/etc/argument/types.xsd">
-        <xs:complexType name="string">
-            <xs:complexContent>
-                <xs:extension base="argumentType">
-                    <xs:attribute name="translate" use="optional" type="xs:boolean"/>
-                </xs:extension>
-            </xs:complexContent>
-        </xs:complexType>
-
         <xs:complexType name="argumentType" abstract="true" mixed="false">
             <xs:complexContent>
                 <xs:extension base="argumentType" />

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

@@ -9,7 +9,7 @@
 use Magento\Framework\Stdlib\BooleanUtils;
 
 /**
- * @covers StringUtils
+ * @covers \Magento\Framework\Data\Argument\Interpreter\StringUtils
  */
 class StringUtilsTest extends \PHPUnit_Framework_TestCase
 {

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

@@ -9,7 +9,7 @@
 use Magento\Framework\Stdlib\BooleanUtils;
 
 /**
- * @covers TranslatableStringUtils
+ * @covers \Magento\Framework\Data\Argument\Interpreter\TranslatableStringUtils
  */
 class TranslatableStringUtilsTest extends \PHPUnit_Framework_TestCase
 {

lib/internal/Magento/Framework/Data/etc/argument/types.xsd

@@ -33,19 +33,21 @@
     </xs:complexType>
 
     <xs:complexType name="string">
-        <xs:annotation>
-            <xs:documentation>
-                @deprecated
-                DI processing MUST not make translation by its own. Should be declared in children.
-            </xs:documentation>
-        </xs:annotation>
         <xs:complexContent>
             <xs:extension base="argumentType">
                 <xs:attribute name="translate" use="optional" type="xs:boolean"/>
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
 
+    <xs:complexType name="translatable">
+        <xs:complexContent>
+            <xs:extension base="string">
+                <xs:attribute name="translatable" use="optional" type="xs:boolean"/>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
     <xs:complexType name="boolean">
         <xs:complexContent>
             <xs:extension base="argumentType"/>

lib/internal/Magento/Framework/ObjectManager/etc/config.xsd

@@ -12,9 +12,9 @@
     <xs:redefine schemaLocation="urn:magento:framework:Data/etc/argument/types.xsd">
         <xs:complexType name="string">
             <xs:complexContent>
-                <xs:extension base="argumentType">
-                    <xs:attribute name="translatable" use="optional" type="xs:boolean"/>
-                </xs:extension>
+                <xs:restriction base="translatable">
+                    <xs:attribute name="translate" use="prohibited"/>
+                </xs:restriction>
             </xs:complexContent>
         </xs:complexType>
 

lib/internal/Magento/Framework/View/Layout/etc/elements.xsd

@@ -8,14 +8,6 @@
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
     <!-- Redefine section -->
     <xs:redefine schemaLocation="urn:magento:framework:Data/etc/argument/types.xsd">
-        <xs:complexType name="string">
-            <xs:complexContent>
-                <xs:extension base="argumentType">
-                    <xs:attribute name="translate" use="optional" type="xs:boolean"/>
-                </xs:extension>
-            </xs:complexContent>
-        </xs:complexType>
-
         <xs:complexType name="argumentType" abstract="true" mixed="true">
             <xs:complexContent>
                 <xs:extension base="argumentType">