Falling back to first translation if no choice available

lstrojny · lstrojny · commit 69206bb206d3 · 2013-01-08T11:14:20.000+01:00
diff --git a/src/Symfony/Component/Translation/MessageSelector.php b/src/Symfony/Component/Translation/MessageSelector.php
@@ -74,7 +74,7 @@ public function choose($message, $number, $locale)
 
         $position = PluralizationRules::get($number, $locale);
         if (!isset($standardRules[$position])) {
-            throw new \InvalidArgumentException(sprintf('Unable to choose a translation for "%s" with locale "%s". Double check that this translation has the correct plural options (e.g. "There is one apple|There are %%count%% apples").', $message, $locale));
+            return current($standardRules);
         }
 
         return $standardRules[$position];
diff --git a/src/Symfony/Component/Translation/Tests/MessageSelectorTest.php b/src/Symfony/Component/Translation/Tests/MessageSelectorTest.php
@@ -25,16 +25,6 @@ public function testChoose($expected, $id, $number)
         $this->assertEquals($expected, $selector->choose($id, $number, 'en'));
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testChooseWhenNoEnoughChoices()
-    {
-        $selector = new MessageSelector();
-
-        $selector->choose('foo', 10, 'en');
-    }
-
     public function getChooseTests()
     {
         return array(
@@ -75,6 +65,9 @@ public function getChooseTests()
             array('There is no apples', '{0} There is no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 0),
             array('There is no apples', '{0} There is no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 0.0),
             array('There is no apples', '{0.0} There is no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 0),
+
+            // #4228
+            array('There are %count% apples', 'There are %count% apples', 10),
         );
     }
 }
diff --git a/src/Symfony/Component/Translation/Tests/TranslatorTest.php b/src/Symfony/Component/Translation/Tests/TranslatorTest.php
@@ -263,16 +263,13 @@ public function testTransChoiceFallbackBis()
         $this->assertEquals('10 things', $translator->transChoice('some_message2', 10, array('%count%' => 10)));
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testTransChoiceFallbackWithNoTranslation()
     {
         $translator = new Translator('ru', new MessageSelector());
         $translator->setFallbackLocale('en');
         $translator->addLoader('array', new ArrayLoader());
 
-        $this->assertEquals('10 things', $translator->transChoice('some_message2', 10, array('%count%' => 10)));
+        $this->assertEquals('some_message2', $translator->transChoice('some_message2', 10, array('%count%' => 10)));
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function choose($message, $number, $locale)`
`74`	`74`
`75`	`75`	`$position = PluralizationRules::get($number, $locale);`
`76`	`76`	`if (!isset($standardRules[$position])) {`
`77`		`- throw new \InvalidArgumentException(sprintf('Unable to choose a translation for "%s" with locale "%s". Double check that this translation has the correct plural options (e.g. "There is one apple\|There are %%count%% apples").', $message, $locale));`
	`77`	`+ return current($standardRules);`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`return $standardRules[$position];`
Original file line number	Diff line number	Diff line change
`@@ -263,16 +263,13 @@ public function testTransChoiceFallbackBis()`
`263`	`263`	`$this->assertEquals('10 things', $translator->transChoice('some_message2', 10, array('%count%' => 10)));`
`264`	`264`	`}`
`265`	`265`
`266`		`- /**`
`267`		`- * @expectedException \InvalidArgumentException`
`268`		`- */`
`269`	`266`	`public function testTransChoiceFallbackWithNoTranslation()`
`270`	`267`	`{`
`271`	`268`	`$translator = new Translator('ru', new MessageSelector());`
`272`	`269`	`$translator->setFallbackLocale('en');`
`273`	`270`	`$translator->addLoader('array', new ArrayLoader());`
`274`	`271`
`275`		`- $this->assertEquals('10 things', $translator->transChoice('some_message2', 10, array('%count%' => 10)));`
	`272`	`+ $this->assertEquals('some_message2', $translator->transChoice('some_message2', 10, array('%count%' => 10)));`
`276`	`273`	`}`
`277`	`274`	`}`
`278`	`275`