Skip to content

[Form][Type Date/Time] added choice_translation_domain option. #15301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
aitboudad wants to merge 2 commits into from
Closed

[Form][Type Date/Time] added choice_translation_domain option. #15301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05003de
[Form][Type Date/Time] added choice_translation_domain option.
aitboudad Jul 17, 2015
67da7ef
[Form][Type Date/Time][choice_translation_domain] added tests.
aitboudad Aug 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Symfony/Component/Form/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ CHANGELOG
2.8.0
-----

* added option "choice_translation_domain" to DateType, TimeType and DateTimeType.
* deprecated option "read_only" in favor of "attr['readonly']"
* added the html5 "range" FormType
* deprecated the "cascade_validation" option in favor of setting "constraints"
Expand Down
3 changes: 3 additions & 0 deletions src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
'days',
'empty_value',
'placeholder',
'choice_translation_domain',
'required',
'translation_domain',
'html5',
Expand All @@ -131,6 +132,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
'with_seconds',
'empty_value',
'placeholder',
'choice_translation_domain',
'required',
'translation_domain',
'html5',
Expand Down Expand Up @@ -245,6 +247,7 @@ public function configureOptions(OptionsResolver $resolver)
$resolver->setDefined(array(
'empty_value', // deprecated
'placeholder',
'choice_translation_domain',
'years',
'months',
'days',
Expand Down
22 changes: 22 additions & 0 deletions src/Symfony/Component/Form/Extension/Core/Type/DateType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
// Only pass a subset of the options to children
$yearOptions['choices'] = $this->formatTimestamps($formatter, '/y+/', $this->listYears($options['years']));
$yearOptions['placeholder'] = $options['placeholder']['year'];
$yearOptions['choice_translation_domain'] = $options['choice_translation_domain']['year'];
$monthOptions['choices'] = $this->formatTimestamps($formatter, '/[M|L]+/', $this->listMonths($options['months']));
$monthOptions['placeholder'] = $options['placeholder']['month'];
$monthOptions['choice_translation_domain'] = $options['choice_translation_domain']['month'];
$dayOptions['choices'] = $this->formatTimestamps($formatter, '/d+/', $this->listDays($options['days']));
$dayOptions['placeholder'] = $options['placeholder']['day'];
$dayOptions['choice_translation_domain'] = $options['choice_translation_domain']['day'];
}

// Append generic carry-along options
Expand Down Expand Up @@ -205,6 +208,23 @@ public function configureOptions(OptionsResolver $resolver)
);
};

$choiceTranslationDomainNormalizer = function (Options $options, $choiceTranslationDomain) {
if (is_array($choiceTranslationDomain)) {
$default = false;

return array_replace(
array('year' => $default, 'month' => $default, 'day' => $default),
$choiceTranslationDomain
);
};

return array(
'year' => $choiceTranslationDomain,
'month' => $choiceTranslationDomain,
'day' => $choiceTranslationDomain,
);
};

$format = function (Options $options) {
return $options['widget'] === 'single_text' ? DateType::HTML5_FORMAT : DateType::DEFAULT_FORMAT;
};
Expand All @@ -231,10 +251,12 @@ public function configureOptions(OptionsResolver $resolver)
// this option.
'data_class' => null,
'compound' => $compound,
'choice_translation_domain' => false,
));

$resolver->setNormalizer('empty_value', $placeholderNormalizer);
$resolver->setNormalizer('placeholder', $placeholderNormalizer);
$resolver->setNormalizer('choice_translation_domain', $choiceTranslationDomainNormalizer);

$resolver->setAllowedValues('input', array(
'datetime',
Expand Down
22 changes: 22 additions & 0 deletions src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
// Only pass a subset of the options to children
$hourOptions['choices'] = $hours;
$hourOptions['placeholder'] = $options['placeholder']['hour'];
$hourOptions['choice_translation_domain'] = $options['choice_translation_domain']['hour'];

if ($options['with_minutes']) {
foreach ($options['minutes'] as $minute) {
Expand All @@ -77,6 +78,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)

$minuteOptions['choices'] = $minutes;
$minuteOptions['placeholder'] = $options['placeholder']['minute'];
$minuteOptions['choice_translation_domain'] = $options['choice_translation_domain']['minute'];
}

if ($options['with_seconds']) {
Expand All @@ -88,6 +90,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)

$secondOptions['choices'] = $seconds;
$secondOptions['placeholder'] = $options['placeholder']['second'];
$secondOptions['choice_translation_domain'] = $options['choice_translation_domain']['second'];
}

// Append generic carry-along options
Expand Down Expand Up @@ -194,6 +197,23 @@ public function configureOptions(OptionsResolver $resolver)
);
};

$choiceTranslationDomainNormalizer = function (Options $options, $choiceTranslationDomain) {
if (is_array($choiceTranslationDomain)) {
$default = false;

return array_replace(
array('hour' => $default, 'minute' => $default, 'second' => $default),
$choiceTranslationDomain
);
};

return array(
'hour' => $choiceTranslationDomain,
'minute' => $choiceTranslationDomain,
'second' => $choiceTranslationDomain,
);
};

$resolver->setDefaults(array(
'hours' => range(0, 23),
'minutes' => range(0, 59),
Expand All @@ -217,10 +237,12 @@ public function configureOptions(OptionsResolver $resolver)
// this option.
'data_class' => null,
'compound' => $compound,
'choice_translation_domain' => false,
));

$resolver->setNormalizer('empty_value', $placeholderNormalizer);
$resolver->setNormalizer('placeholder', $placeholderNormalizer);
$resolver->setNormalizer('choice_translation_domain', $choiceTranslationDomainNormalizer);

$resolver->setAllowedValues('input', array(
'datetime',
Expand Down
53 changes: 53 additions & 0 deletions src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,4 +519,57 @@ public function testTimeTypeSingleTextErrorsBubbleUp()
$this->assertSame(array(), iterator_to_array($form['time']->getErrors()));
$this->assertSame(array($error), iterator_to_array($form->getErrors()));
}

public function testPassDefaultChoiceTranslationDomain()
{
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\DateTimeType', null, array(
'with_seconds' => true,
));

$view = $form->createView();

$this->assertFalse($view['date']['year']->vars['choice_translation_domain']);
$this->assertFalse($view['date']['month']->vars['choice_translation_domain']);
$this->assertFalse($view['date']['day']->vars['choice_translation_domain']);
$this->assertFalse($view['time']['hour']->vars['choice_translation_domain']);
$this->assertFalse($view['time']['minute']->vars['choice_translation_domain']);
$this->assertFalse($view['time']['second']->vars['choice_translation_domain']);
}

public function testPassChoiceTranslationDomainAsString()
{
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\DateTimeType', null, array(
'choice_translation_domain' => 'messages',
'with_seconds' => true,
));

$view = $form->createView();
$this->assertSame('messages', $view['date']['year']->vars['choice_translation_domain']);
$this->assertSame('messages', $view['date']['month']->vars['choice_translation_domain']);
$this->assertSame('messages', $view['date']['day']->vars['choice_translation_domain']);
$this->assertSame('messages', $view['time']['hour']->vars['choice_translation_domain']);
$this->assertSame('messages', $view['time']['minute']->vars['choice_translation_domain']);
$this->assertSame('messages', $view['time']['second']->vars['choice_translation_domain']);
}

public function testPassChoiceTranslationDomainAsArray()
{
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\DateTimeType', null, array(
'choice_translation_domain' => array(
'year' => 'foo',
'month' => 'test',
'hour' => 'foo',
'second' => 'test',
),
'with_seconds' => true,
));

$view = $form->createView();
$this->assertSame('foo', $view['date']['year']->vars['choice_translation_domain']);
$this->assertSame('test', $view['date']['month']->vars['choice_translation_domain']);
$this->assertFalse($view['date']['day']->vars['choice_translation_domain']);
$this->assertSame('foo', $view['time']['hour']->vars['choice_translation_domain']);
$this->assertFalse($view['time']['minute']->vars['choice_translation_domain']);
$this->assertSame('test', $view['time']['second']->vars['choice_translation_domain']);
}
}
37 changes: 37 additions & 0 deletions src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -950,4 +950,41 @@ public function testYearsFor32BitsMachines()

$this->assertEquals($listChoices, $view['year']->vars['choices']);
}

public function testPassDefaultChoiceTranslationDomain()
{
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\DateType');

$view = $form->createView();
$this->assertFalse($view['year']->vars['choice_translation_domain']);
$this->assertFalse($view['month']->vars['choice_translation_domain']);
$this->assertFalse($view['day']->vars['choice_translation_domain']);
}

public function testPassChoiceTranslationDomainAsString()
{
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\DateType', null, array(
'choice_translation_domain' => 'messages',
));

$view = $form->createView();
$this->assertSame('messages', $view['year']->vars['choice_translation_domain']);
$this->assertSame('messages', $view['month']->vars['choice_translation_domain']);
$this->assertSame('messages', $view['day']->vars['choice_translation_domain']);
}

public function testPassChoiceTranslationDomainAsArray()
{
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\DateType', null, array(
'choice_translation_domain' => array(
'year' => 'foo',
'day' => 'test',
),
));

$view = $form->createView();
$this->assertSame('foo', $view['year']->vars['choice_translation_domain']);
$this->assertFalse($view['month']->vars['choice_translation_domain']);
$this->assertSame('test', $view['day']->vars['choice_translation_domain']);
}
}
38 changes: 38 additions & 0 deletions src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,4 +736,42 @@ public function testThrowExceptionIfSecondsIsInvalid()
'seconds' => 'bad value',
));
}

public function testPassDefaultChoiceTranslationDomain()
{
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\TimeType');

$view = $form->createView();
$this->assertFalse($view['hour']->vars['choice_translation_domain']);
$this->assertFalse($view['minute']->vars['choice_translation_domain']);
}

public function testPassChoiceTranslationDomainAsString()
{
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\TimeType', null, array(
'choice_translation_domain' => 'messages',
'with_seconds' => true,
));

$view = $form->createView();
$this->assertSame('messages', $view['hour']->vars['choice_translation_domain']);
$this->assertSame('messages', $view['minute']->vars['choice_translation_domain']);
$this->assertSame('messages', $view['second']->vars['choice_translation_domain']);
}

public function testPassChoiceTranslationDomainAsArray()
{
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\TimeType', null, array(
'choice_translation_domain' => array(
'hour' => 'foo',
'second' => 'test',
),
'with_seconds' => true,
));

$view = $form->createView();
$this->assertSame('foo', $view['hour']->vars['choice_translation_domain']);
$this->assertFalse($view['minute']->vars['choice_translation_domain']);
$this->assertSame('test', $view['second']->vars['choice_translation_domain']);
}
}