diff --git a/Form/Type/TranslatableStringFormType.php b/Form/Type/TranslatableStringFormType.php index 24f38d8d2..e9183f86f 100644 --- a/Form/Type/TranslatableStringFormType.php +++ b/Form/Type/TranslatableStringFormType.php @@ -8,21 +8,23 @@ namespace Chill\MainBundle\Form\Type; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\Translation\Translator; class TranslatableStringFormType extends AbstractType { private $availableLanguages; // The langauges availaible private $frameworkTranslatorFallback; // The langagues used for the translation - public function __construct(array $availableLanguages, $frameworkTranslatorFallback) { + public function __construct(array $availableLanguages, Translator $translator) { $this->availableLanguages = $availableLanguages; - $this->frameworkTranslatorFallback = $frameworkTranslatorFallback; + $this->frameworkTranslatorFallback = $translator->getFallbackLocales(); } public function buildForm(FormBuilderInterface $builder, array $options) { foreach ($this->availableLanguages as $lang) { $builder->add($lang, 'text', - array('required' => ($lang === $this->frameworkTranslatorFallback))); + array('required' => (in_array($lang, + $this->frameworkTranslatorFallback)))); } } diff --git a/Resources/config/services.yml b/Resources/config/services.yml index 3cb3cbf0b..122f72fd7 100644 --- a/Resources/config/services.yml +++ b/Resources/config/services.yml @@ -34,7 +34,7 @@ services: arguments: - "%chill_main.available_languages%" #- "%framework.translator.fallback%" - - "%locale%" + - "@translator.default" tags: - { name: form.type, alias: translatable_string }