some additional features and tests

juzna · Nov 19, 2011 · 4265510 · 4265510
1 parent 1b572f1
commit 4265510
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 6 deletions.
diff --git a/lib/Gedmo/Translator/TranslationProxy.php b/lib/Gedmo/Translator/TranslationProxy.php
@@ -13,7 +13,7 @@
  */
 class TranslationProxy
 {
-    protected $locale;
+    private $locale;
     private $translatable;
     private $properties = array();
     private $class;
@@ -96,7 +96,17 @@ public function __set($property, $value)
             return $this->setTranslatedValue($property, $value);
         }
 
-        $this->translatable->property = $value;
+        $this->translatable->$property = $value;
+    }
+
+    /**
+     * Returns locale name for the current translation proxy instance.
+     *
+     * @return  string
+     */
+    public function getProxyLocale()
+    {
+        return $this->locale;
     }
 
     /**
@@ -108,7 +118,9 @@ public function __set($property, $value)
      */
     public function getTranslatedValue($property)
     {
-        return $this->findOrCreateTranslationForProperty($property, $this->locale)->getValue();
+        return $this
+            ->findOrCreateTranslationForProperty($property, $this->getProxyLocale())
+            ->getValue();
     }
 
     /**
@@ -119,7 +131,9 @@ public function getTranslatedValue($property)
      */
     public function setTranslatedValue($property, $value)
     {
-        $this->findOrCreateTranslationForProperty($property, $this->locale)->setValue($value);
+        $this
+            ->findOrCreateTranslationForProperty($property, $this->getProxyLocale())
+            ->setValue($value);
     }
 
     /**

diff --git a/tests/Gedmo/Translator/Fixture/Person.php b/tests/Gedmo/Translator/Fixture/Person.php
@@ -21,12 +21,12 @@ class Person
     /**
      * @ORM\Column(name="name", type="string", length=128)
      */
-    private $name;
+    public $name;
 
     /**
      * @ORM\Column(name="desc", type="string", length=128)
      */
-    private $description;
+    public $description;
 
     public function getId()
     {

diff --git a/tests/Gedmo/Translator/TranslatableTest.php b/tests/Gedmo/Translator/TranslatableTest.php
@@ -86,6 +86,20 @@ public function testTranslatable()
         $this->assertSame('multilingual description', $person->translate('ru_RU')->getDescription());
     }
 
+    public function testTranslatableWithMagicProperties()
+    {
+        $person = new Person();
+        $person->setName('Jen');
+        $person->translate('ru_RU')->name = 'Женя';
+        $person->translate('ru_RU')->description = 'multilingual description';
+
+        $this->assertSame('Jen', $person->name);
+        $this->assertSame('Jen', $person->translate()->name);
+        $this->assertSame('Женя', $person->translate('ru_RU')->name);
+        $this->assertSame('multilingual description', $person->translate('ru_RU')->description);
+        $this->assertSame('multilingual description', $person->description);
+    }
+
     public function testTranslatableWithCustomProxy()
     {
         $person = new PersonCustom();