[FrameworkBundle] Added the translation domain

Author: stof

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

@@ -1,11 +1,11 @@
 <?php foreach ($options as $choice => $label): ?>
  <?php if ($view['form']->isChoiceGroup($label)): ?>
- <optgroup label="<?php echo $view->escape($view['translator']->trans($choice)) ?>">
+ <optgroup label="<?php echo $view->escape($view['translator']->trans($choice, array(), $translation_domain)) ?>">
  <?php foreach ($label as $nestedChoice => $nestedLabel): ?>
- <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>
+ <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>
  <?php endforeach ?>
  </optgroup>
  <?php else: ?>
- <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>
+ <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>
  <?php endif ?>
 <?php endforeach ?>

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

@@ -10,7 +10,7 @@
  <?php echo $view['form']->renderBlock('attributes') ?>
  <?php if ($multiple): ?> multiple="multiple"<?php endif ?>
  >
- <?php if (null !== $empty_value): ?><option value=""><?php echo $view->escape($view['translator']->trans($empty_value)) ?></option><?php endif; ?>
+ <?php if (null !== $empty_value): ?><option value=""><?php echo $view->escape($view['translator']->trans($empty_value, array(), $translation_domain)) ?></option><?php endif; ?>
  <?php if (count($preferred_choices) > 0): ?>
  <?php echo $view['form']->renderBlock('choice_options', array('options' => $preferred_choices)) ?>
  <?php if (count($choices) > 0 && null !== $separator): ?>

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

@@ -1,2 +1,2 @@
 <?php if ($required) { $attr['class'] = (isset($attr['class']) ? $attr['class'] : '').' required'; } ?>
-<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>
+<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

@@ -1,2 +1,2 @@
 <?php if ($required) { $attr['class'] = (isset($attr['class']) ? $attr['class'] : '').' required'; } ?>
-<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>
+<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>