Merge pull request doctrine#602 from dantleech/translated_props

Fixed translated property name mapping
uwej711 · Mar 4, 2015 · 4e470ba · 4e470ba
2 parents 8210438 + 96e6ddc
commit 4e470ba
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/lib/Doctrine/ODM/PHPCR/.UnitOfWork.php.swl b/lib/Doctrine/ODM/PHPCR/.UnitOfWork.php.swl
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/ClassMetadata.php b/lib/Doctrine/ODM/PHPCR/Mapping/ClassMetadata.php
@@ -1379,8 +1379,8 @@ public function mapField(array $mapping, ClassMetadata $inherited = null)
         $mapping = $this->validateAndCompleteFieldMapping($mapping, $inherited);
 
         // Add the field to the list of translatable fields
-        if (!empty($mapping['translated']) && !in_array($mapping['property'], $this->translatableFields)) {
-            $this->translatableFields[] = $mapping['property'];
+        if (!empty($mapping['translated']) && !in_array($mapping['fieldName'], $this->translatableFields)) {
+            $this->translatableFields[] = $mapping['fieldName'];
         }
 
         if (!$parentMapping) {

diff --git a/lib/Doctrine/ODM/PHPCR/Translation/TranslationStrategy/AttributeTranslationStrategy.php b/lib/Doctrine/ODM/PHPCR/Translation/TranslationStrategy/AttributeTranslationStrategy.php
@@ -48,8 +48,8 @@ public function saveTranslation(array $data, NodeInterface $node, ClassMetadata
         // no need to validate non-nullable condition, the UoW does that for all fields
         $nullFields = array();
         foreach ($data as $field => $propValue) {
-            $propName = $this->getTranslatedPropertyName($locale, $field);
             $mapping = $metadata->mappings[$field];
+            $propName = $this->getTranslatedPropertyName($locale, $mapping['property']);
 
             if ($mapping['multivalue'] && $propValue) {
                 $propValue = (array) $propValue;

diff --git a/tests/Doctrine/Tests/Models/Translation/Article.php b/tests/Doctrine/Tests/Models/Translation/Article.php
@@ -54,6 +54,9 @@ class Article
     /** @PHPCRODM\String(translated=true, nullable=true) */
     public $nullable;
 
+    /** @PHPCRODM\String(translated=true, nullable=true, property="custom-property-name") */
+    public $customPropertyName;
+
     /** @PHPCRODM\String(translated=true, assoc="", nullable=true)*/
     public $assoc;