feature #24358 [TwigBundle] register an identity translator as fallback (xabbuh)

fabpot · fabpot · commit 54135cb9ca59 · 2017-09-28T06:27:55.000-07:00
This PR was merged into the 3.4 branch. Discussion ---------- [TwigBundle] register an identity translator as fallback | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #24303 (comment) | License | MIT | Doc PR | The Form component can be used without the Translation component. However, to be able to use the default form themes provided by the TwigBridge you need to have the `trans` filter to be available. This change ensure that there will always be a `trans` filter which as a fallback will just return the message key if no translator is present. Commits ------- f0876e5 register an identity translator as fallback
diff --git a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
@@ -32,7 +32,7 @@ class TranslationExtension extends AbstractExtension
     private $translator;
     private $translationNodeVisitor;
 
-    public function __construct(TranslatorInterface $translator, NodeVisitorInterface $translationNodeVisitor = null)
+    public function __construct(TranslatorInterface $translator = null, NodeVisitorInterface $translationNodeVisitor = null)
     {
         if (!$translationNodeVisitor) {
             $translationNodeVisitor = new TranslationNodeVisitor();
@@ -94,11 +94,19 @@ public function getTranslationNodeVisitor()
 
     public function trans($message, array $arguments = array(), $domain = null, $locale = null)
     {
+        if (null === $this->translator) {
+            return $message;
+        }
+
         return $this->translator->trans($message, $arguments, $domain, $locale);
     }
 
     public function transchoice($message, $count, array $arguments = array(), $domain = null, $locale = null)
     {
+        if (null === $this->translator) {
+            return $message;
+        }
+
         return $this->translator->transChoice($message, $count, array_merge(array('%count%' => $count), $arguments), $domain, $locale);
     }
 
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
@@ -35,9 +35,6 @@ public function process(ContainerBuilder $container)
         if (!interface_exists('Symfony\Component\Routing\Generator\UrlGeneratorInterface')) {
             $container->removeDefinition('twig.extension.routing');
         }
-        if (!interface_exists('Symfony\Component\Translation\TranslatorInterface')) {
-            $container->removeDefinition('twig.extension.trans');
-        }
 
         if (!class_exists('Symfony\Component\Yaml\Yaml')) {
             $container->removeDefinition('twig.extension.yaml');
@@ -49,10 +46,6 @@ public function process(ContainerBuilder $container)
             $container->getDefinition('twig.loader.native_filesystem')->addMethodCall('addPath', array(dirname(dirname($reflClass->getFileName())).'/Resources/views/Form'));
         }
 
-        if ($container->has('translator')) {
-            $container->getDefinition('twig.extension.trans')->addTag('twig.extension');
-        }
-
         if ($container->has('router')) {
             $container->getDefinition('twig.extension.routing')->addTag('twig.extension');
         }
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -72,7 +72,8 @@
         </service>
 
         <service id="twig.extension.trans" class="Symfony\Bridge\Twig\Extension\TranslationExtension">
-            <argument type="service" id="translator" />
+            <argument type="service" id="translator" on-invalid="null" />
+            <tag name="twig.extension" />
         </service>
 
         <service id="twig.extension.assets" class="Symfony\Bridge\Twig\Extension\AssetExtension">

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class TranslationExtension extends AbstractExtension`
`32`	`32`	`private $translator;`
`33`	`33`	`private $translationNodeVisitor;`
`34`	`34`
`35`		`- public function __construct(TranslatorInterface $translator, NodeVisitorInterface $translationNodeVisitor = null)`
	`35`	`+ public function __construct(TranslatorInterface $translator = null, NodeVisitorInterface $translationNodeVisitor = null)`
`36`	`36`	`{`
`37`	`37`	`if (!$translationNodeVisitor) {`
`38`	`38`	`$translationNodeVisitor = new TranslationNodeVisitor();`
`@@ -94,11 +94,19 @@ public function getTranslationNodeVisitor()`
`94`	`94`
`95`	`95`	`public function trans($message, array $arguments = array(), $domain = null, $locale = null)`
`96`	`96`	`{`
	`97`	`+ if (null === $this->translator) {`
	`98`	`+ return $message;`
	`99`	`+ }`
	`100`	`+`
`97`	`101`	`return $this->translator->trans($message, $arguments, $domain, $locale);`
`98`	`102`	`}`
`99`	`103`
`100`	`104`	`public function transchoice($message, $count, array $arguments = array(), $domain = null, $locale = null)`
`101`	`105`	`{`
	`106`	`+ if (null === $this->translator) {`
	`107`	`+ return $message;`
	`108`	`+ }`
	`109`	`+`
`102`	`110`	`return $this->translator->transChoice($message, $count, array_merge(array('%count%' => $count), $arguments), $domain, $locale);`
`103`	`111`	`}`
`104`	`112`
Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,6 @@ public function process(ContainerBuilder $container)`
`35`	`35`	`if (!interface_exists('Symfony\Component\Routing\Generator\UrlGeneratorInterface')) {`
`36`	`36`	`$container->removeDefinition('twig.extension.routing');`
`37`	`37`	`}`
`38`		`- if (!interface_exists('Symfony\Component\Translation\TranslatorInterface')) {`
`39`		`- $container->removeDefinition('twig.extension.trans');`
`40`		`- }`
`41`	`38`
`42`	`39`	`if (!class_exists('Symfony\Component\Yaml\Yaml')) {`
`43`	`40`	`$container->removeDefinition('twig.extension.yaml');`
`@@ -49,10 +46,6 @@ public function process(ContainerBuilder $container)`
`49`	`46`	`$container->getDefinition('twig.loader.native_filesystem')->addMethodCall('addPath', array(dirname(dirname($reflClass->getFileName())).'/Resources/views/Form'));`
`50`	`47`	`}`
`51`	`48`
`52`		`- if ($container->has('translator')) {`
`53`		`- $container->getDefinition('twig.extension.trans')->addTag('twig.extension');`
`54`		`- }`
`55`		`-`
`56`	`49`	`if ($container->has('router')) {`
`57`	`50`	`$container->getDefinition('twig.extension.routing')->addTag('twig.extension');`
`58`	`51`	`}`