symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
Lines changed: 0 additions & 4 deletions b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
Lines changed: 0 additions & 4 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Templating/Helper/TranslatorHelper.php
Lines changed: 9 additions & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/Templating/Helper/TranslatorHelper.php
Lines changed: 9 additions & 1 deletion
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/templating_php_translator_disabled.php
Lines changed: 0 additions & 8 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/templating_php_translator_disabled.php
Lines changed: 0 additions & 8 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/templating_php_translator_enabled.php
Lines changed: 0 additions & 8 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/templating_php_translator_enabled.php
Lines changed: 0 additions & 8 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
Lines changed: 0 additions & 14 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
Lines changed: 0 additions & 14 deletions
@@ -873,10 +873,6 @@ private function registerTemplatingConfiguration(array $config, ContainerBuilder
             } else {
                 $container->removeDefinition('templating.helper.assets');
             }
-
-            if (!$this->translationConfigEnabled) {
-                $container->removeDefinition('templating.helper.translator');
-            }
         }
     }
 
 
@@ -58,7 +58,7 @@
 
         <service id="templating.helper.translator" class="Symfony\Bundle\FrameworkBundle\Templating\Helper\TranslatorHelper">
             <tag name="templating.helper" alias="translator" />
-            <argument type="service" id="translator" />
+            <argument type="service" id="translator" on-invalid="null" />
         </service>
 
         <service id="templating.helper.form" class="Symfony\Bundle\FrameworkBundle\Templating\Helper\FormHelper">
 
@@ -21,7 +21,7 @@ class TranslatorHelper extends Helper
 {
     protected $translator;
 
-    public function __construct(TranslatorInterface $translator)
+    public function __construct(TranslatorInterface $translator = null)
     {
         $this->translator = $translator;
     }
@@ -31,6 +31,10 @@ public function __construct(TranslatorInterface $translator)
      */
     public function trans($id, array $parameters = array(), $domain = 'messages', $locale = null)
     {
+        if (null === $this->translator) {
+            return strtr($id, $parameters);
+        }
+
         return $this->translator->trans($id, $parameters, $domain, $locale);
     }
 
@@ -39,6 +43,10 @@ public function trans($id, array $parameters = array(), $domain = 'messages', $l
      */
     public function transChoice($id, $number, array $parameters = array(), $domain = 'messages', $locale = null)
     {
+        if (null === $this->translator) {
+            return strtr($id, $parameters);
+        }
+
         return $this->translator->transChoice($id, $number, $parameters, $domain, $locale);
     }
 
 
@@ -701,20 +701,6 @@ public function testTranslatorMultipleFallbacks()
         $this->assertEquals(array('en', 'fr'), $calls[1][1][0]);
     }
 
-    public function testTranslatorHelperIsRegisteredWhenTranslatorIsEnabled()
-    {
-        $container = $this->createContainerFromFile('templating_php_translator_enabled');
-
-        $this->assertTrue($container->has('templating.helper.translator'));
-    }
-
-    public function testTranslatorHelperIsNotRegisteredWhenTranslatorIsDisabled()
-        $container = $this->createContainerFromFile('templating_php_translator_disabled');
-
-        $this->assertFalse($container->has('templating.helper.translator'));
-    }
-
     /**
      * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
      */
Original file line number	Diff line number	Diff line change
`@@ -873,10 +873,6 @@ private function registerTemplatingConfiguration(array $config, ContainerBuilder`
`873`	`873`	`} else {`
`874`	`874`	`$container->removeDefinition('templating.helper.assets');`
`875`	`875`	`}`
`876`		`-`
`877`		`- if (!$this->translationConfigEnabled) {`
`878`		`- $container->removeDefinition('templating.helper.translator');`
`879`		`- }`
`880`	`876`	`}`
`881`	`877`	`}`
`882`	`878`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class TranslatorHelper extends Helper`
`21`	`21`	`{`
`22`	`22`	`protected $translator;`
`23`	`23`
`24`		`- public function __construct(TranslatorInterface $translator)`
	`24`	`+ public function __construct(TranslatorInterface $translator = null)`
`25`	`25`	`{`
`26`	`26`	`$this->translator = $translator;`
`27`	`27`	`}`
`@@ -31,6 +31,10 @@ public function __construct(TranslatorInterface $translator)`
`31`	`31`	`*/`
`32`	`32`	`public function trans($id, array $parameters = array(), $domain = 'messages', $locale = null)`
`33`	`33`	`{`
	`34`	`+ if (null === $this->translator) {`
	`35`	`+ return strtr($id, $parameters);`
	`36`	`+ }`
	`37`	`+`
`34`	`38`	`return $this->translator->trans($id, $parameters, $domain, $locale);`
`35`	`39`	`}`
`36`	`40`
`@@ -39,6 +43,10 @@ public function trans($id, array $parameters = array(), $domain = 'messages', $l`
`39`	`43`	`*/`
`40`	`44`	`public function transChoice($id, $number, array $parameters = array(), $domain = 'messages', $locale = null)`
`41`	`45`	`{`
	`46`	`+ if (null === $this->translator) {`
	`47`	`+ return strtr($id, $parameters);`
	`48`	`+ }`
	`49`	`+`
`42`	`50`	`return $this->translator->transChoice($id, $number, $parameters, $domain, $locale);`
`43`	`51`	`}`
`44`	`52`