[Validation] Fixed IdentityTranslator to pass correct Locale to MessageSelector
This commit is contained in:
parent
b46e0ad556
commit
191d3203d0
@ -21,6 +21,7 @@ namespace Symfony\Component\Translation;
|
|||||||
class IdentityTranslator implements TranslatorInterface
|
class IdentityTranslator implements TranslatorInterface
|
||||||
{
|
{
|
||||||
private $selector;
|
private $selector;
|
||||||
|
private $locale;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor.
|
* Constructor.
|
||||||
@ -41,6 +42,7 @@ class IdentityTranslator implements TranslatorInterface
|
|||||||
*/
|
*/
|
||||||
public function setLocale($locale)
|
public function setLocale($locale)
|
||||||
{
|
{
|
||||||
|
$this->locale = $locale;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -50,6 +52,7 @@ class IdentityTranslator implements TranslatorInterface
|
|||||||
*/
|
*/
|
||||||
public function getLocale()
|
public function getLocale()
|
||||||
{
|
{
|
||||||
|
return $this->locale ?: \Locale::getDefault();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -69,6 +72,6 @@ class IdentityTranslator implements TranslatorInterface
|
|||||||
*/
|
*/
|
||||||
public function transChoice($id, $number, array $parameters = array(), $domain = 'messages', $locale = null)
|
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -29,19 +29,43 @@ class IdentityTranslatorTest extends \PHPUnit_Framework_TestCase
|
|||||||
/**
|
/**
|
||||||
* @dataProvider getTransChoiceTests
|
* @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());
|
$translator = new IdentityTranslator(new MessageSelector());
|
||||||
|
|
||||||
$this->assertEquals($expected, $translator->transChoice($id, $number, $parameters));
|
$this->assertEquals($expected, $translator->transChoice($id, $number, $parameters));
|
||||||
}
|
}
|
||||||
|
|
||||||
// noop
|
|
||||||
public function testGetSetLocale()
|
public function testGetSetLocale()
|
||||||
{
|
{
|
||||||
$translator = new IdentityTranslator(new MessageSelector());
|
$translator = new IdentityTranslator(new MessageSelector());
|
||||||
$translator->setLocale('en');
|
$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()
|
public function getTransTests()
|
||||||
@ -55,7 +79,12 @@ class IdentityTranslatorTest extends \PHPUnit_Framework_TestCase
|
|||||||
public function getTransChoiceTests()
|
public function getTransChoiceTests()
|
||||||
{
|
{
|
||||||
return array(
|
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)),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user