Skip to content

Commit 0b5c4b2

Browse files
committed
[Form] Date, Time, DateTimeType forget translation domain
1 parent f7fb34a commit 0b5c4b2

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ public function buildForm(FormBuilder $builder, array $options)
5656
'empty_value',
5757
'required',
5858
'invalid_message',
59-
'invalid_message_parameters'
59+
'invalid_message_parameters',
60+
'translation_domain',
6061
)));
6162
$timeOptions = array_intersect_key($options, array_flip(array(
6263
'hours',
@@ -66,7 +67,8 @@ public function buildForm(FormBuilder $builder, array $options)
6667
'empty_value',
6768
'required',
6869
'invalid_message',
69-
'invalid_message_parameters'
70+
'invalid_message_parameters',
71+
'translation_domain',
7072
)));
7173

7274
// If `widget` is set, overwrite widget options from `date` and `time`

src/Symfony/Component/Form/Extension/Core/Type/DateType.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,22 +80,24 @@ public function buildForm(FormBuilder $builder, array $options)
8080
array_combine($options['years'], $options['years']), 4, '0', STR_PAD_LEFT
8181
),
8282
'empty_value' => $options['empty_value']['year'],
83-
'required' => $options['required'],
8483
);
8584
$monthOptions = array(
8685
'choice_list' => new MonthChoiceList(
8786
$formatter, $options['months']
8887
),
8988
'empty_value' => $options['empty_value']['month'],
90-
'required' => $options['required'],
9189
);
9290
$dayOptions = array(
9391
'choice_list' => new PaddedChoiceList(
9492
array_combine($options['days'], $options['days']), 2, '0', STR_PAD_LEFT
9593
),
9694
'empty_value' => $options['empty_value']['day'],
97-
'required' => $options['required'],
9895
);
96+
97+
// Append generic carry-along options
98+
foreach (array('required', 'translation_domain') as $passOpt) {
99+
$yearOptions[$passOpt] = $monthOptions[$passOpt] = $dayOptions[$passOpt] = $options[$passOpt];
100+
}
99101
}
100102

101103
$builder

src/Symfony/Component/Form/Extension/Core/Type/TimeType.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,12 @@ public function buildForm(FormBuilder $builder, array $options)
5353
array_combine($options['hours'], $options['hours']), 2, '0', STR_PAD_LEFT
5454
),
5555
'empty_value' => $options['empty_value']['hour'],
56-
'required' => $options['required'],
5756
);
5857
$minuteOptions = array(
5958
'choice_list' => new PaddedChoiceList(
6059
array_combine($options['minutes'], $options['minutes']), 2, '0', STR_PAD_LEFT
6160
),
6261
'empty_value' => $options['empty_value']['minute'],
63-
'required' => $options['required'],
6462
);
6563

6664
if ($options['with_seconds']) {
@@ -69,9 +67,16 @@ public function buildForm(FormBuilder $builder, array $options)
6967
array_combine($options['seconds'], $options['seconds']), 2, '0', STR_PAD_LEFT
7068
),
7169
'empty_value' => $options['empty_value']['second'],
72-
'required' => $options['required'],
7370
);
7471
}
72+
73+
// Append generic carry-along options
74+
foreach (array('required', 'translation_domain') as $passOpt) {
75+
$hourOptions[$passOpt] = $minuteOptions[$passOpt] = $options[$passOpt];
76+
if ($options['with_seconds']) {
77+
$secondOptions[$passOpt] = $options[$passOpt];
78+
}
79+
}
7580
}
7681

7782
$builder

0 commit comments

Comments
 (0)