bug #24514 [TwigBridge] replace parameters in dummy identity translator (xabbuh)

fabpot · fabpot · commit f35996d228e1 · 2017-10-12T10:35:24.000-07:00
This PR was merged into the 3.4 branch. Discussion ---------- [TwigBridge] replace parameters in dummy identity translator | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #24358 (comment) | License | MIT | Doc PR | Commits ------- 2c9c3d8 replace parameters in dummy identity translator
diff --git a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
@@ -95,7 +95,7 @@ public function getTranslationNodeVisitor()
     public function trans($message, array $arguments = array(), $domain = null, $locale = null)
     {
         if (null === $this->translator) {
-            return $message;
+            return strtr($message, $arguments);
         }
 
         return $this->translator->trans($message, $arguments, $domain, $locale);
@@ -104,7 +104,7 @@ public function trans($message, array $arguments = array(), $domain = null, $loc
     public function transchoice($message, $count, array $arguments = array(), $domain = null, $locale = null)
     {
         if (null === $this->translator) {
-            return $message;
+            return strtr($message, $arguments);
         }
 
         return $this->translator->transChoice($message, $count, array_merge(array('%count%' => $count), $arguments), $domain, $locale);

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public function getTranslationNodeVisitor()`
`95`	`95`	`public function trans($message, array $arguments = array(), $domain = null, $locale = null)`
`96`	`96`	`{`
`97`	`97`	`if (null === $this->translator) {`
`98`		`- return $message;`
	`98`	`+ return strtr($message, $arguments);`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`return $this->translator->trans($message, $arguments, $domain, $locale);`
`@@ -104,7 +104,7 @@ public function trans($message, array $arguments = array(), $domain = null, $loc`
`104`	`104`	`public function transchoice($message, $count, array $arguments = array(), $domain = null, $locale = null)`
`105`	`105`	`{`
`106`	`106`	`if (null === $this->translator) {`
`107`		`- return $message;`
	`107`	`+ return strtr($message, $arguments);`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`return $this->translator->transChoice($message, $count, array_merge(array('%count%' => $count), $arguments), $domain, $locale);`