Fix children translation based on the parent document.

lib/Doctrine/ODM/PHPCR/UnitOfWork.php

@@ -2291,11 +2291,18 @@ public function getChildren($document, $filter = null, $fetchDepth = null, $igno
         $node = $this->session->getNode($this->getDocumentId($document));
         $this->setFetchDepth($oldFetchDepth);
 
+        $metadata = $this->dm->getClassMetadata(get_class($document));
+        $locale = $this->getLocale($document, $metadata);
+        $childrenHints = array();
+        if (!is_null($locale)) {
+            $childrenHints['locale'] = $locale;
+        }
+
         $childNodes = $node->getNodes($filter);
         $childDocuments = array();
         foreach ($childNodes as $name => $childNode) {
             try {
-                $childDocuments[$name] = $this->createDocument(null, $childNode);
+                $childDocuments[$name] = $this->createDocument(null, $childNode, $childrenHints);
             } catch (MissingTranslationException $e) {
                 if (!$ignoreUntranslated) {
                     throw $e;

tests/Doctrine/Tests/Models/Translation/Article.php

@@ -3,6 +3,7 @@
 namespace Doctrine\Tests\Models\Translation;
 
 use Doctrine\ODM\PHPCR\Mapping\Annotations as PHPCRODM;
+use Doctrine\Common\Collections\ArrayCollection;
 
 /**
  * @PHPCRODM\Document(translator="attribute")
@@ -33,6 +34,14 @@ class Article
     /** @PHPCRODM\String(translated=true) */
     private $text;
 
+    /** @PHPCRODM\Children() */
+    protected  $children;
+
+    public function __construct()
+    {
+        $this->children = new ArrayCollection();
+    }
+
     public function getText()
     {
         return $this->text;
@@ -41,4 +50,22 @@ public function setText($text)
     {
         $this->text = $text;
     }
+
+    /**
+     * @return ArrayCollection
+     */
+    public function getChildren()
+    {
+        return $this->children;
+    }
+
+    /**
+     * Sets the children
+     *
+     * @param $children ArrayCollection
+     */
+    public function setChildren(ArrayCollection $children)
+    {
+        $this->children = $children;
+    }
 }

tests/Doctrine/Tests/Models/Translation/Comment.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Doctrine\Tests\Models\Translation;
+
+use Doctrine\ODM\PHPCR\Mapping\Annotations as PHPCRODM;
+
+/**
+ * @PHPCRODM\Document(translator="attribute")
+ */
+class Comment
+{
+    /** @PHPCRODM\Id(strategy="parent") */
+    public $id;
+
+    /**
+     * @PHPCRODM\Nodename()
+     */
+    public $name;
+
+    /**
+     * @PHPCRODM\Locale
+     */
+    public $locale = 'en';
+
+    /** @PHPCRODM\ParentDocument */
+    public $parent;
+
+    /** @PHPCRODM\String(translated=true) */
+    private $text;
+
+    /**
+     * @return string
+     */
+    public function getText()
+    {
+        return $this->text;
+    }
+
+    /**
+     * @param string $text
+     */
+    public function setText($text)
+    {
+        $this->text = $text;
+    }
+}

tests/Doctrine/Tests/ODM/PHPCR/Functional/Translation/DocumentManagerTest.php

@@ -3,6 +3,7 @@
 namespace Doctrine\Tests\ODM\PHPCR\Functional\Translation;
 
 use Doctrine\Tests\Models\Translation\Article,
+    Doctrine\Tests\Models\Translation\Comment,
     Doctrine\Tests\Models\Translation\InvalidMapping,
     Doctrine\Tests\Models\Translation\DerivedArticle,
     Doctrine\Tests\Models\CMS\CmsArticle,
@@ -41,6 +42,11 @@ class DocumentManagerTest extends PHPCRFunctionalTestCase
      */
     protected $class = 'Doctrine\Tests\Models\Translation\Article';
 
+    /**
+     * @var string
+     */
+    protected $childrenClass = 'Doctrine\Tests\Models\Translation\Comment';
+
     public function setUp()
     {
         $localePrefs = array(
@@ -246,6 +252,54 @@ public function testFindTranslation()
         $this->assertEquals('Un autre sujet', $doc->topic);
     }
 
+    /**
+     * Test that children are retrieved in the parent locale
+     */
+    public function testFindTranslationWithChildren()
+    {
+        $this->dm->persist($this->doc);
+        $this->dm->bindTranslation($this->doc, 'en');
+        $this->doc->topic = 'Un autre sujet';
+        $this->dm->bindTranslation($this->doc, 'fr');
+
+        $comment = new Comment();
+        $comment->name = 'new-comment';
+        $comment->parent = $this->doc;
+        $this->dm->persist($comment);
+
+        $comment->setText('This is a great article');
+        $this->dm->bindTranslation($comment, 'en');
+        $comment->setText('Très bon article');
+        $this->dm->bindTranslation($comment, 'fr');
+        $this->dm->flush();
+
+        $doc = $this->dm->findTranslation($this->class, '/functional/' . $this->testNodeName, 'fr');
+        $this->assertEquals('fr', $doc->locale);
+        $children = $doc->getChildren();
+        foreach ($children as $comment) {
+            $this->assertEquals('fr', $comment->locale);
+            $this->assertEquals('Très bon article', $comment->getText());
+        }
+        $children = $this->dm->getChildren($doc);
+        foreach ($children as $comment) {
+            $this->assertEquals('fr', $comment->locale);
+            $this->assertEquals('Très bon article', $comment->getText());
+        }
+
+        $doc = $this->dm->findTranslation($this->class, '/functional/' . $this->testNodeName, 'en');
+        $this->assertEquals('en', $doc->locale);
+        $children = $doc->getChildren();
+        foreach ($children as $comment) {
+            $this->assertEquals('en', $comment->locale);
+            $this->assertEquals('This is a great article', $comment->getText());
+        }
+        $children = $this->dm->getChildren($doc);
+        foreach ($children as $comment) {
+            $this->assertEquals('en', $comment->locale);
+            $this->assertEquals('This is a great article', $comment->getText());
+        }
+    }
+
     public function testFindByUUID()
     {
         $this->doc->topic = 'Un autre sujet';