symfony
diff --git a/‎src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
Lines changed: 0 additions & 8 deletions b/‎src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
Lines changed: 0 additions & 8 deletions
diff --git a/‎src/Symfony/Component/Form/Extension/Core/Type/BaseType.php
Lines changed: 1 addition & 5 deletions b/‎src/Symfony/Component/Form/Extension/Core/Type/BaseType.php
Lines changed: 1 addition & 5 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php
73B2
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php
73B2
Lines changed: 1 addition & 1 deletion
@@ -90,19 +90,11 @@ public function getTranslationNodeVisitor()
 
     public function trans($message, array $arguments = array(), $domain = null, $locale = null)
     {
-        if (null === $domain) {
-            $domain = 'messages';
-        }
-
         return $this->translator->trans($message, $arguments, $domain, $locale);
     }
 
     public function transchoice($message, $count, array $arguments = array(), $domain = null, $locale = null)
     {
-        if (null === $domain) {
-            $domain = 'messages';
-        }
-
         return $this->translator->transChoice($message, $count, array_merge(array('%count%' => $count), $arguments), $domain, $locale);
     }
 
 
@@ -56,7 +56,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
                 $uniqueBlockPrefix = '_'.$blockName;
             }
 
-            if (!$translationDomain) {
+            if (null === $translationDomain) {
                 $translationDomain = $view->parent->vars['translation_domain'];
             }
         } else {
@@ -76,10 +76,6 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         }
         $blockPrefixes[] = $uniqueBlockPrefix;
 
-        if (!$translationDomain) {
-            $translationDomain = 'messages';
-        }
-
         $view->vars = array_replace($view->vars, array(
             'form' => $view,
             'id' => $id,
 
@@ -112,7 +112,7 @@ public function testDefaultTranslationDomain()
             ->getForm()
             ->createView();
 
-        $this->assertEquals('messages', $view['child']->vars['translation_domain']);
+        $this->assertNull($view['child']->vars['translation_domain']);
     }
 
     public function testPassLabelToView()
Original file line number	Diff line number	Diff line change
`@@ -90,19 +90,11 @@ public function getTranslationNodeVisitor()`
`90`	`90`
`91`	`91`	`public function trans($message, array $arguments = array(), $domain = null, $locale = null)`
`92`	`92`	`{`
`93`		`- if (null === $domain) {`
`94`		`- $domain = 'messages';`
`95`		`- }`
`96`		`-`
`97`	`93`	`return $this->translator->trans($message, $arguments, $domain, $locale);`
`98`	`94`	`}`
`99`	`95`
`100`	`96`	`public function transchoice($message, $count, array $arguments = array(), $domain = null, $locale = null)`
`101`	`97`	`{`
`102`		`- if (null === $domain) {`
`103`		`- $domain = 'messages';`
`104`		`- }`
`105`		`-`
`106`	`98`	`return $this->translator->transChoice($message, $count, array_merge(array('%count%' => $count), $arguments), $domain, $locale);`
`107`	`99`	`}`
`108`	`100`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)`
`56`	`56`	`$uniqueBlockPrefix = '_'.$blockName;`
`57`	`57`	`}`
`58`	`58`
`59`		`- if (!$translationDomain) {`
	`59`	`+ if (null === $translationDomain) {`
`60`	`60`	`$translationDomain = $view->parent->vars['translation_domain'];`
`61`	`61`	`}`
`62`	`62`	`} else {`
`@@ -76,10 +76,6 @@ public function buildView(FormView $view, FormInterface $form, array $options)`
`76`	`76`	`}`
`77`	`77`	`$blockPrefixes[] = $uniqueBlockPrefix;`
`78`	`78`
`79`		`- if (!$translationDomain) {`
`80`		`- $translationDomain = 'messages';`
`81`		`- }`
`82`		`-`
`83`	`79`	`$view->vars = array_replace($view->vars, array(`
`84`	`80`	`'form' => $view,`
`85`	`81`	`'id' => $id,`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public function testDefaultTranslationDomain()`
`112`	`112`	`->getForm()`
`113`	`113`	`->createView();`
`114`	`114`
`115`		`- $this->assertEquals('messages', $view['child']->vars['translation_domain']);`
	`115`	`+ $this->assertNull($view['child']->vars['translation_domain']);`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`public function testPassLabelToView()`