Merge pull request #140 from symfony-cmf/translation-cleanup

cleanup translation handling

Author: dbu

Admin/Extension/PublishableExtension.php

@@ -45,7 +45,6 @@ public function configureFormFields(FormMapper $formMapper)
             ))
             ->add('publishable', 'checkbox', array(
                 'required' => false,
-            ), array(
             ))
             ->end();
     }

Admin/Extension/TranslatableExtension.php

@@ -50,7 +50,10 @@ public function __construct($locales, $formGroup = 'form.group_general')
     public function configureListFields(ListMapper $listMapper)
     {
         $listMapper
-            ->add('locales', 'choice', array('template' => 'SonataDoctrinePHPCRAdminBundle:CRUD:locales.html.twig'))
+            ->add('locales', 'choice', array(
+                'template' => 'SonataDoctrinePHPCRAdminBundle:CRUD:locales.html.twig',
+                'translation_domain' => 'CmfCoreBundle',
+            ))
         ;
     }
 
@@ -61,11 +64,11 @@ public function configureFormFields(FormMapper $formMapper)
     {
         $formMapper
             ->with($this->formGroup)
+            // do not set a translation_domain for this group or group_general will be translated by our domain.
             ->add('locale', 'choice', array(
-                'translation_domain' => 'CmfCoreBundle',
                 'choices' => array_combine($this->locales, $this->locales),
                 'empty_value' => '',
-            ))
+            ), array('translation_domain' => 'CmfCoreBundle'))
             ->end()
         ;
     }