[Validation] Fixed IdentityTranslator to pass correct Locale to MessageSelector

webmozart · webmozart · commit c3b640490fc8 · 2013-08-19T12:15:39.000+02:00
diff --git a/IdentityTranslator.php b/IdentityTranslator.php
@@ -21,6 +21,7 @@
 class IdentityTranslator implements TranslatorInterface
 {
     private $selector;
+    private $locale;
 
     /**
      * Constructor.
@@ -41,6 +42,7 @@ public function __construct(MessageSelector $selector)
      */
     public function setLocale($locale)
     {
+        $this->locale = $locale;
     }
 
     /**
@@ -50,6 +52,7 @@ public function setLocale($locale)
      */
     public function getLocale()
     {
+        return $this->locale ?: \Locale::getDefault();
     }
 
     /**
@@ -69,6 +72,6 @@ public function trans($id, array $parameters = array(), $domain = 'messages', $l
      */
     public function transChoice($id, $number, array $parameters = array(), $domain = 'messages', $locale = null)
     {
-        return strtr($this->selector->choose((string) $id, (int) $number, $locale), $parameters);
+        return strtr($this->selector->choose((string) $id, (int) $number, $locale ?: $this->getLocale()), $parameters);
     }
 }
diff --git a/Tests/IdentityTranslatorTest.php b/Tests/IdentityTranslatorTest.php
@@ -29,19 +29,43 @@ public function testTrans($expected, $id, $parameters)
     /**
      * @dataProvider getTransChoiceTests
      */
-    public function testTransChoice($expected, $id, $number, $parameters)
+    public function testTransChoiceWithExplicitLocale($expected, $id, $number, $parameters)
     {
+        $translator = new IdentityTranslator(new MessageSelector());
+        $translator->setLocale('en');
+
+        $this->assertEquals($expected, $translator->transChoice($id, $number, $parameters));
+    }
+
+    /**
+     * @dataProvider getTransChoiceTests
+     */
+    public function testTransChoiceWithDefaultLocale($expected, $id, $number, $parameters)
+    {
+        \Locale::setDefault('en');
+
         $translator = new IdentityTranslator(new MessageSelector());
 
         $this->assertEquals($expected, $translator->transChoice($id, $number, $parameters));
     }
 
-    // noop
     public function testGetSetLocale()
     {
         $translator = new IdentityTranslator(new MessageSelector());
         $translator->setLocale('en');
-        $translator->getLocale();
+
+        $this->assertEquals('en', $translator->getLocale());
+    }
+
+    public function testGetLocaleReturnsDefaultLocaleIfNotSet()
+    {
+        $translator = new IdentityTranslator(new MessageSelector());
+
+        \Locale::setDefault('en');
+        $this->assertEquals('en', $translator->getLocale());
+
+        \Locale::setDefault('pt_BR');
+        $this->assertEquals('pt_BR', $translator->getLocale());
     }
 
     public function getTransTests()
@@ -55,7 +79,12 @@ public function getTransTests()
     public function getTransChoiceTests()
     {
         return array(
-            array('There is 10 apples', '{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples', 10, array('%count%' => 10)),
+            array('There is no apple', '{0} There is no apple|{1} There is one apple|]1,Inf] There are %count% apples', 0, array('%count%' => 0)),
+            array('There is one apple', '{0} There is no apple|{1} There is one apple|]1,Inf] There are %count% apples', 1, array('%count%' => 1)),
+            array('There are 10 apples', '{0} There is no apple|{1} There is one apple|]1,Inf] There are %count% apples', 10, array('%count%' => 10)),
+            array('There are 0 apples', 'There is 1 apple|There are %count% apples', 0, array('%count%' => 0)),
+            array('There is 1 apple', 'There is 1 apple|There are %count% apples', 1, array('%count%' => 1)),
+            array('There are 10 apples', 'There is 1 apple|There are %count% apples', 10, array('%count%' => 10)),
         );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`class IdentityTranslator implements TranslatorInterface`
`22`	`22`	`{`
`23`	`23`	`private $selector;`
	`24`	`+ private $locale;`
`24`	`25`
`25`	`26`	`/**`
`26`	`27`	`* Constructor.`
`@@ -41,6 +42,7 @@ public function __construct(MessageSelector $selector)`
`41`	`42`	`*/`
`42`	`43`	`public function setLocale($locale)`
`43`	`44`	`{`
	`45`	`+ $this->locale = $locale;`
`44`	`46`	`}`
`45`	`47`
`46`	`48`	`/**`
`@@ -50,6 +52,7 @@ public function setLocale($locale)`
`50`	`52`	`*/`
`51`	`53`	`public function getLocale()`
`52`	`54`	`{`
	`55`	`+ return $this->locale ?: \Locale::getDefault();`
`53`	`56`	`}`
`54`	`57`
`55`	`58`	`/**`
`@@ -69,6 +72,6 @@ public function trans($id, array $parameters = array(), $domain = 'messages', $l`
`69`	`72`	`*/`
`70`	`73`	`public function transChoice($id, $number, array $parameters = array(), $domain = 'messages', $locale = null)`
`71`	`74`	`{`
`72`		`- return strtr($this->selector->choose((string) $id, (int) $number, $locale), $parameters);`
	`75`	`+ return strtr($this->selector->choose((string) $id, (int) $number, $locale ?: $this->getLocale()), $parameters);`
`73`	`76`	`}`
`74`	`77`	`}`