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

[Form] added support for error message pluralization

Browse Source
This commit is contained in:
Martin Hasoň 2012-02-02 13:36:42 +01:00
parent 345981f6b6
commit 7a6376eb29
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Component/Form/Extension/Validator/Validator/DelegatingValidator.php
View File

@ -61,7 +61,8 @@ class DelegatingValidator implements FormValidatorInterface
$propertyPath = new PropertyPath($violation->getPropertyPath());
$template = $violation->getMessageTemplate();
$parameters = $violation->getMessageParameters();
$error = new FormError($template, $parameters);
$pluralization = $violation->getMessagePluralization();
$error = new FormError($template, $parameters, $pluralization);
$child = $form;
foreach ($propertyPath->getElements() as $element) {
@ -82,7 +83,8 @@ class DelegatingValidator implements FormValidatorInterface
$propertyPath = $violation->getPropertyPath();
$template = $violation->getMessageTemplate();
$parameters = $violation->getMessageParameters();
$error = new FormError($template, $parameters);
$pluralization = $violation->getMessagePluralization();
$error = new FormError($template, $parameters, $pluralization);
foreach ($mapping as $mappedPath => $child) {
if (preg_match($mappedPath, $propertyPath)) {

26
src/Symfony/Component/Form/FormError.php
View File

@ -30,6 +30,12 @@ class FormError
*/
protected $messageParameters;
/**
* The value for error message pluralization
* @var integer|null
*/
protected $messagePluralization;
/**
* Constructor
*
@ -37,14 +43,16 @@ class FormError
* $messageTemplate.
* @see Symfony\Component\Translation\Translator
*
* @param string $messageTemplate The template for the error message
* @param array $messageParameters The parameters that should be
* substituted in the message template.
* @param string $messageTemplate The template for the error message
* @param array $messageParameters The parameters that should be
* substituted in the message template.
* @param integer $messagePluralization The value for error message pluralization
*/
public function __construct($messageTemplate, array $messageParameters = array())
public function __construct($messageTemplate, array $messageParameters = array(), $messagePluralization = null)
{
$this->messageTemplate = $messageTemplate;
$this->messageParameters = $messageParameters;
$this->messagePluralization = $messagePluralization;
}
/**
@ -76,4 +84,14 @@ class FormError
{
return $this->messageParameters;
}
/**
* Returns the value for error message pluralization.
*
* @return integer|null
*/
public function getMessagePluralization()
{
return $this->messagePluralization;
}
}