diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Translation] Fixed regression: When only one rule is passed to transChoice(), this rule should be used

This commit is contained in:
Bernhard Schussek 2013-08-23 17:24:14 +02:00
parent ee3cb88ec7
commit 0951b8de16
4 changed files with 60 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Component/Translation/MessageSelector.php
View File

@ -15,6 +15,7 @@ namespace Symfony\Component\Translation;
* MessageSelector. * MessageSelector.
* *
* @author Fabien Potencier <fabien@symfony.com> * @author Fabien Potencier <fabien@symfony.com>
* @author Bernhard Schussek <bschussek@gmail.com>
* *
* @api * @api
*/ */
@ -73,7 +74,14 @@ class MessageSelector
} }
$position = PluralizationRules::get($number, $locale); $position = PluralizationRules::get($number, $locale);
if (!isset($standardRules[$position])) { if (!isset($standardRules[$position])) {
// when there's exactly one rule given, and that rule is a standard
// rule, use this rule
if (1 === count($parts) && isset($standardRules[0])) {
return $standardRules[0];
}
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)); 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));
} }

2
src/Symfony/Component/Translation/Tests/IdentityTranslatorTest.php
View File

@ -85,6 +85,8 @@ class IdentityTranslatorTest extends \PHPUnit_Framework_TestCase
array('There are 0 apples', 'There is 1 apple|There are %count% apples', 0, array('%count%' => 0)), 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 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)), array('There are 10 apples', 'There is 1 apple|There are %count% apples', 10, array('%count%' => 10)),
// custom validation messages may be coded with a fixed value
array('There are 2 apples', 'There are 2 apples', 2, array('%count%' => 2)),
); );
} }
} }

76
src/Symfony/Component/Translation/Tests/MessageSelectorTest.php
View File

@ -25,43 +25,61 @@ class MessageSelectorTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected, $selector->choose($id, $number, 'en')); $this->assertEquals($expected, $selector->choose($id, $number, 'en'));
} }
/** public function testReturnMessageIfExactlyOneStandardRuleIsGiven()
* @expectedException InvalidArgumentException
*/
public function testChooseWhenNoEnoughChoices()
{ {
$selector = new MessageSelector(); $selector = new MessageSelector();
$selector->choose('foo', 10, 'en'); $this->assertEquals('There are two apples', $selector->choose('There are two apples', 2, 'en'));
}
/**
* @dataProvider getNonMatchingMessages
* @expectedException \InvalidArgumentException
*/
public function testThrowExceptionIfMatchingMessageCannotBeFound($id, $number)
{
$selector = new MessageSelector();
$selector->choose($id, $number, 'en');
}
public function getNonMatchingMessages()
{
return array(
array('{0} There is no apple|{1} There is one apple', 2),
array('{1} There is one apple|]1,Inf] There are %count% apples', 0),
array('{1} There is one apple|]2,Inf] There are %count% apples', 2),
array('{0} There is no apple|There is one apple', 2),
);
} }
public function getChooseTests() public function getChooseTests()
{ {
return array( return array(
array('There is no apples', '{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples', 0), array('There is no apple', '{0} There is no apple|{1} There is one apple|]1,Inf] There are %count% apples', 0),
array('There is no apples', '{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples', 0), array('There is no apple', '{0} There is no apple|{1} There is one apple|]1,Inf] There are %count% apples', 0),
array('There is no apples', '{0}There is no apples|{1} There is one apple|]1,Inf] There is %count% apples', 0), array('There is no apple', '{0}There is no apple|{1} There is one apple|]1,Inf] There are %count% apples', 0),
array('There is one apple', '{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples', 1), array('There is one apple', '{0} There is no apple|{1} There is one apple|]1,Inf] There are %count% apples', 1),
array('There is %count% apples', '{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples', 10), array('There are %count% apples', '{0} There is no apple|{1} There is one apple|]1,Inf] There are %count% apples', 10),
array('There is %count% apples', '{0} There is no apples|{1} There is one apple|]1,Inf]There is %count% apples', 10), array('There are %count% apples', '{0} There is no apple|{1} There is one apple|]1,Inf]There are %count% apples', 10),
array('There is %count% apples', '{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples', 10), array('There are %count% apples', '{0} There is no apple|{1} There is one apple|]1,Inf] There are %count% apples', 10),
array('There is %count% apples', 'There is one apple|There is %count% apples', 0), array('There are %count% apples', 'There is one apple|There are %count% apples', 0),
array('There is one apple', 'There is one apple|There is %count% apples', 1), array('There is one apple', 'There is one apple|There are %count% apples', 1),
array('There is %count% apples', 'There is one apple|There is %count% apples', 10), array('There are %count% apples', 'There is one apple|There are %count% apples', 10),
array('There is %count% apples', 'one: There is one apple|more: There is %count% apples', 0), array('There are %count% apples', 'one: There is one apple|more: There are %count% apples', 0),
array('There is one apple', 'one: There is one apple|more: There is %count% apples', 1), array('There is one apple', 'one: There is one apple|more: There are %count% apples', 1),
array('There is %count% apples', 'one: There is one apple|more: There is %count% apples', 10), array('There are %count% apples', 'one: There is one apple|more: There are %count% apples', 10),
array('There is no apples', '{0} There is no apples|one: There is one apple|more: There is %count% apples', 0), array('There is no apple', '{0} There is no apple|one: There is one apple|more: There are %count% apples', 0),
array('There is one apple', '{0} There is no apples|one: There is one apple|more: There is %count% apples', 1), array('There is one apple', '{0} There is no apple|one: There is one apple|more: There are %count% apples', 1),
array('There is %count% apples', '{0} There is no apples|one: There is one apple|more: There is %count% apples', 10), array('There are %count% apples', '{0} There is no apple|one: There is one apple|more: There are %count% apples', 10),
array('', '{0}|{1} There is one apple|]1,Inf] There is %count% apples', 0), array('', '{0}|{1} There is one apple|]1,Inf] There are %count% apples', 0),
array('', '{0} There is no apples|{1}|]1,Inf] There is %count% apples', 1), array('', '{0} There is no apple|{1}|]1,Inf] There are %count% apples', 1),
// Indexed only tests which are Gettext PoFile* compatible strings. // Indexed only tests which are Gettext PoFile* compatible strings.
array('There are %count% apples', 'There is one apple|There are %count% apples', 0), array('There are %count% apples', 'There is one apple|There are %count% apples', 0),
@ -69,12 +87,12 @@ class MessageSelectorTest extends \PHPUnit_Framework_TestCase
array('There are %count% apples', 'There is one apple|There are %count% apples', 2), array('There are %count% apples', 'There is one apple|There are %count% apples', 2),
// Tests for float numbers // Tests for float numbers
array('There is almost one apple', '{0} There is no apples|]0,1[ There is almost one apple|{1} There is one apple|[1,Inf] There is more than one apple', 0.7), array('There is almost one apple', '{0} There is no apple|]0,1[ There is almost one apple|{1} There is one apple|[1,Inf] There is more than one apple', 0.7),
array('There is one apple', '{0} There is no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 1), array('There is one apple', '{0} There is no apple|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 1),
array('There is more than one apple', '{0} There is no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 1.7), array('There is more than one apple', '{0} There is no apple|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 1.7),
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 apple', '{0} There is no apple|]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 apple', '{0} There is no apple|]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), array('There is no apple', '{0.0} There is no apple|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 0),
); );
} }
} }

7
src/Symfony/Component/Translation/Tests/TranslatorTest.php
View File

@ -277,16 +277,15 @@ class TranslatorTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('10 things', $translator->transChoice('some_message2', 10, array('%count%' => 10))); $this->assertEquals('10 things', $translator->transChoice('some_message2', 10, array('%count%' => 10)));
} }
/**
* @expectedException \InvalidArgumentException
*/
public function testTransChoiceFallbackWithNoTranslation() public function testTransChoiceFallbackWithNoTranslation()
{ {
$translator = new Translator('ru', new MessageSelector()); $translator = new Translator('ru', new MessageSelector());
$translator->setFallbackLocale('en'); $translator->setFallbackLocale('en');
$translator->addLoader('array', new ArrayLoader()); $translator->addLoader('array', new ArrayLoader());
$this->assertEquals('10 things', $translator->transChoice('some_message2', 10, array('%count%' => 10))); // consistent behavior with Translator::trans(), which returns the string
// unchanged if it can't be found
$this->assertEquals('some_message2', $translator->transChoice('some_message2', 10, array('%count%' => 10)));
} }
} }