Revert change made in #28523

Nyholm · Nyholm · commit 39fcccf0e578 · 2018-09-22T12:40:57.000+02:00
diff --git a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
@@ -34,7 +34,6 @@ class TranslationExtension extends AbstractExtension
         getLocale as private;
         setLocale as private;
         trans as private doTrans;
-        transChoice as private doTransChoice;
     }
 
     private $translator;
@@ -108,7 +107,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 $this->doTransChoice($message, $count, array_merge(array('%count%' => $count), $arguments), $domain, $locale);
+            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
`@@ -34,7 +34,6 @@ class TranslationExtension extends AbstractExtension`
`34`	`34`	`getLocale as private;`
`35`	`35`	`setLocale as private;`
`36`	`36`	`trans as private doTrans;`
`37`		`- transChoice as private doTransChoice;`
`38`	`37`	`}`
`39`	`38`
`40`	`39`	`private $translator;`
`@@ -108,7 +107,7 @@ public function trans($message, array $arguments = array(), $domain = null, $loc`
`108`	`107`	`public function transchoice($message, $count, array $arguments = array(), $domain = null, $locale = null)`
`109`	`108`	`{`
`110`	`109`	`if (null === $this->translator) {`
`111`		`- return $this->doTransChoice($message, $count, array_merge(array('%count%' => $count), $arguments), $domain, $locale);`
	`110`	`+ return strtr($message, $arguments);`
`112`	`111`	`}`
`113`	`112`
`114`	`113`	`return $this->translator->transChoice($message, $count, array_merge(array('%count%' => $count), $arguments), $domain, $locale);`