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

Commit f2b1e3c

Browse files
committed
MAGETWO-67048: Cannot add translate attribute into the di.xml
1 parent 42fb9df commit f2b1e3c

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,6 @@
3636
<xs:complexContent>
3737
<xs:extension base="argumentType">
3838
<xs:attribute name="translate" use="optional" type="xs:boolean"/>
39-
</xs:extension>
40-
</xs:complexContent>
41-
</xs:complexType>
42-
43-
<xs:complexType name="translatable">
44-
<xs:complexContent>
45-
<xs:extension base="string">
4639
<xs:attribute name="translatable" use="optional" type="xs:boolean"/>
4740
</xs:extension>
4841
</xs:complexContent>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,12 @@
1111

1212
<xs:redefine schemaLocation="urn:magento:framework:Data/etc/argument/types.xsd">
1313
<xs:complexType name="string">
14-
<xs:complexContent>
15-
<xs:restriction base="translatable">
14+
<xs:complexContent mixed="true">
15+
<xs:restriction base="string">
1616
<xs:attribute name="translate" use="prohibited"/>
1717
</xs:restriction>
1818
</xs:complexContent>
1919
</xs:complexType>
20-
2120
<xs:complexType name="argumentType" abstract="true" mixed="false">
2221
<xs:complexContent>
2322
<xs:extension base="argumentType" />

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@
88
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
99
<!-- Redefine section -->
1010
<xs:redefine schemaLocation="urn:magento:framework:Data/etc/argument/types.xsd">
11+
<xs:complexType name="string">
12+
<xs:complexContent mixed="true">
13+
<xs:restriction base="string">
14+
<xs:attribute name="translatable" use="prohibited"/>
15+
</xs:restriction>
16+
</xs:complexContent>
17+
</xs:complexType>
1118
<xs:complexType name="argumentType" abstract="true" mixed="true">
1219
<xs:complexContent>
1320
<xs:extension base="argumentType">

0 commit comments

Comments
 (0)