8000 [FrameworkBundle] Added the translation domain · echavez/symfony@a2cf023 · GitHub
[go: up one dir, main page]
Skip to content

Commit a2cf023

Browse files
stofstof
committed
[FrameworkBundle] Added the translation domain
1 parent 3aa7582 commit a2cf023

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_options.html.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php foreach ($options as $choice => $label): ?>
22
<?php if ($view['form']->isChoiceGroup($label)): ?>
3-
<optgroup label="<?php echo $view->escape($view['translator']->trans($choice)) ?>">
3+
<optgroup label="<?php echo $view->escape($view['translator']->trans($choice, array(), $translation_domain)) ?>">
44
<?php foreach ($label as $nestedChoice => $nestedLabel): ?>
5-
<option value="<?php echo $view->escape($nestedChoice) ?>"<?php if ($view['form']->isChoiceSelected($form, $nestedChoice)): ?> selected="selected"<?php endif?>><?php echo $view->escape($view['translator']->trans($nestedLabel)) ?></option>
5+
<option value="<?php echo $view->escape($nestedChoice) ?>"<?php if ($view['form']->isChoiceSelected($form, $nestedChoice)): ?> selected="selected"<?php endif?>><?php echo $view->escape($view['translator']->trans($nestedLabel, array(), $translation_domain)) ?></option>
66
<?php endforeach ?>
77
</optgroup>
88
<?php else: ?>
9-
<option value="<?php echo $view->escape($choice) ?>"<?php if ($view['form']->isChoiceSelected($form, $choice)): ?> selected="selected"<?php endif?>><?php echo $view->escape($view['translator']->trans($label)) ?></option>
9+
<option value="<?php echo $view->escape($choice) ?>"<?php if ($view['form']->isChoiceSelected($form, $choice)): ?> selected="selected"<?php endif?>><?php echo $view->escape($view['translator']->trans($label, array(), $translation_domain)) ?></option>
1010
<?php endif ?>
1111
<?php endforeach ?>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget.html.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<?php echo $view['form']->renderBlock('attributes') ?>
1111
<?php if ($multiple): ?> multiple="multiple"<?php endif ?>
1212
>
13-
<?php if (null !== $empty_value): ?><option value=""><?php echo $view->escape($view['translator']->trans($empty_value)) ?></option><?php endif; ?>
13+
<?php if (null !== $empty_value): ?><option value=""><?php echo $view->escape($view['translator']->trans($empty_value, array(), $translation_domain)) ?></option><?php endif; ?>
1414
<?php if (count($preferred_choices) > 0): ?>
1515
<?php echo $view['form']->renderBlock('choice_options', array('options' => $preferred_choices)) ?>
1616
<?php if (count($choices) > 0 && null !== $separator): ?>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_label.html.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?php if ($required) { $attr['class'] = (isset($attr['class']) ? $attr['class'] : '').' required'; } ?>
2-
<label for="<?php echo $view->escape($id) ?>" <?php foreach($attr as $k => $v) { printf('%s="%s" ', $view->escape($k), $view->escape($v)); } ?>><?php echo $view->escape($view['translator']->trans($label)) ?></label>
2+
<label for="<?php echo $view->escape($id) ?>" <?php foreach($attr as $k => $v) { printf('%s="%s" ', $view->escape($k), $view->escape($v)); } ?>><?php echo $view->escape($view['translator']->trans($label, array(), $translation_domain)) ?></label>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_label.html.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?php if ($required) { $attr['class'] = (isset($attr['class']) ? $attr['class'] : '').' required'; } ?>
2-
<label <?php foreach($attr as $k => $v) { printf('%s="%s" ', $view->escape($k), $view->escape($v)); } ?>><?php echo $view->escape($view['translator']->trans($label)) ?></label>
2+
<label <?php foreach($attr as $k => $v) { printf('%s="%s" ', $view->escape($k), $view->escape($v)); } ?>><?php echo $view->escape($view['translator']->trans($label, array(), $translation_domain)) ?></label>

0 commit comments

Comments
 (0)
0