Changed XML translatable field names

fsi-open · Jun 14, 2017 · 92ed885 · 92ed885
1 parent 454f0e0
commit 92ed885
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/doc/translatable/xml.md b/doc/translatable/xml.md
@@ -45,8 +45,8 @@ XML for the entity:
         </id>
         <one-to-many field="translations" target-entity="Acme\DemoBundle\Entity\UserTranslation" mapped-by="user" index-by="locale" />
 
-        <fsi:locale field="locale" /><!-- "field" is required to point at which property the mapping points -->
-        <fsi:translatable field="name" mappedBy="translations" />
+        <fsi:translatable-locale field="locale" /><!-- "field" is required to point at which property the mapping points -->
+        <fsi:translatable-field field="name" mappedBy="translations" />
     </entity>
 
 </doctrine-mapping>
@@ -94,7 +94,7 @@ XML for the translation:
 
         <field type="string" name="content" length="255"/>
         <field type="string" name="locale" length="2">
-            <fsi:locale /><!-- No value needed, field name is used as locale property identifier -->
+            <fsi:translatable-locale /><!-- No value needed, field name is used as locale property identifier -->
         </field>
 
         <many-to-one field="user" target-entity="cme\DemoBundle\Entity\User" inversed-by="translations" />

diff --git a/doctrine-extensions-mapping.xsd b/doctrine-extensions-mapping.xsd
@@ -14,17 +14,17 @@
         <xs:attribute name="keyPattern" type="xs:string" use="optional"/>
     </xs:complexType>
 
-    <xs:element name="translatable" type="fsi:translatable"/>
+    <xs:element name="translatable-field" type="fsi:translatable-field"/>
 
-    <xs:complexType name="translatable">
+    <xs:complexType name="translatable-field">
         <xs:attribute name="mappedBy" type="xs:string" use="required"/>
         <xs:attribute name="field" type="xs:string" use="required"/>
         <xs:attribute name="targetField" type="xs:string" use="optional"/>
     </xs:complexType>
 
-    <xs:element name="locale" type="fsi:locale"/>
+    <xs:element name="translatable-locale" type="fsi:translatable-locale"/>
 
-    <xs:complexType name="locale">
+    <xs:complexType name="translatable-locale">
         <xs:attribute name="field" type="xs:string" use="optional" default="locale"/>
     </xs:complexType>
 

diff --git a/lib/FSi/DoctrineExtensions/Translatable/Mapping/Driver/Xml.php b/lib/FSi/DoctrineExtensions/Translatable/Mapping/Driver/Xml.php
@@ -15,8 +15,8 @@
 
 class Xml extends AbstractXmlDriver
 {
-    const LOCALE = 'locale';
-    const FIELD_TRANSLATION = 'translatable';
+    const LOCALE = 'translatable-locale';
+    const FIELD_TRANSLATION = 'translatable-field';
 
     /**
      * {@inheritdoc}

diff --git a/.../Fixture/XML/config/FSi.DoctrineExtensions.Tests.Translatable.Fixture.Common.Page.dcm.xml b/.../Fixture/XML/config/FSi.DoctrineExtensions.Tests.Translatable.Fixture.Common.Page.dcm.xml
@@ -13,8 +13,8 @@
         </id>
         <one-to-many field="translations" target-entity="PageTranslation" mapped-by="page" index-by="locale" />
 
-        <fsi:locale field="locale" />
-        <fsi:translatable field="content" mappedBy="translations" />
+        <fsi:translatable-locale field="locale" />
+        <fsi:translatable-field field="content" mappedBy="translations" />
     </entity>
 
 </doctrine-mapping>
diff --git a/...L/config/FSi.DoctrineExtensions.Tests.Translatable.Fixture.Common.PageTranslation.dcm.xml b/...L/config/FSi.DoctrineExtensions.Tests.Translatable.Fixture.Common.PageTranslation.dcm.xml
@@ -12,7 +12,7 @@
 
         <field type="string" name="content" length="255"/>
         <field type="string" name="locale" length="2">
-            <fsi:locale />
+            <fsi:translatable-locale />
         </field>
 
         <many-to-one field="page" target-entity="Page" inversed-by="translations" />