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

[Form] fixed bug that prevented setLocale from working

Browse Source
This commit is contained in:
Brandon Turner 2010-09-24 12:51:26 -05:00 committed by Fabien Potencier
parent eb942c8f18
commit 86b6aff5b6
1 changed files with 47 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/Symfony/Component/Form/DateField.php
View File

@ -96,11 +96,7 @@ class DateField extends HybridField
$this->addOption('widget', self::CHOICE, self::$widgets);
$this->addOption('pattern');
$this->formatter = new \IntlDateFormatter(
$this->locale,
self::$intlFormats[$this->getOption('format')],
\IntlDateFormatter::NONE
);
$this->initFormatter();
$transformers = array();
@ -140,15 +136,7 @@ class DateField extends HybridField
$this->setFieldMode(self::GROUP);
$this->add(new ChoiceField('year', array(
'choices' => $this->generatePaddedChoices($this->getOption('years'), 4),
)));
$this->add(new ChoiceField('month', array(
'choices' => $this->generateMonthChoices($this->getOption('months')),
)));
$this->add(new ChoiceField('day', array(
'choices' => $this->generatePaddedChoices($this->getOption('days'), 2),
)));
$this->addChoiceFields();
}
if (count($transformers) > 0) {
@ -239,4 +227,49 @@ class DateField extends HybridField
), $pattern);
}
}
/**
* Sets the locale of this field.
*
* @see Localizable
*/
public function setLocale($locale)
{
parent::setLocale($locale);
$this->initFormatter();
if ($this->getOption('widget') === self::CHOICE) {
$this->addChoiceFields();
}
}
/**
* Initializes (or reinitializes) the formatter
*/
protected function initFormatter()
{
$this->formatter = new \IntlDateFormatter(
$this->locale,
self::$intlFormats[$this->getOption('format')],
\IntlDateFormatter::NONE
);
}
/**
* Adds (or replaces if already added) the fields used when widget=CHOICE
*/
protected function addChoiceFields()
{
$this->add(new ChoiceField('year', array(
'choices' => $this->generatePaddedChoices($this->getOption('years'), 4),
)));
$this->add(new ChoiceField('month', array(
'choices' => $this->generateMonthChoices($this->getOption('months')),
)));
$this->add(new ChoiceField('day', array(
'choices' => $this->generatePaddedChoices($this->getOption('days'), 2),
)));
}
}