[Translation] Fixed issue with new vs old TranslatorInterface in TranslationDataCollector

althaus · nicolas-grekas · commit a1677c78a668 · 2019-05-23T17:21:18.000+02:00
diff --git a/src/Symfony/Component/Translation/DataCollectorTranslator.php b/src/Symfony/Component/Translation/DataCollectorTranslator.php
@@ -68,10 +68,10 @@ public function transChoice($id, $number, array $parameters = [], $domain = null
     {
         if ($this->translator instanceof TranslatorInterface) {
             $trans = $this->translator->trans($id, ['%count%' => $number] + $parameters, $domain, $locale);
+        } else {
+            $trans = $this->translator->transChoice($id, $number, $parameters, $domain, $locale);
         }
 
-        $trans = $this->translator->transChoice($id, $number, $parameters, $domain, $locale);
-
         $this->collectMessage($locale, $domain, $id, $trans, ['%count%' => $number] + $parameters);
 
         return $trans;

Original file line number	Diff line number	Diff line change
`@@ -68,10 +68,10 @@ public function transChoice($id, $number, array $parameters = [], $domain = null`
`68`	`68`	`{`
`69`	`69`	`if ($this->translator instanceof TranslatorInterface) {`
`70`	`70`	`$trans = $this->translator->trans($id, ['%count%' => $number] + $parameters, $domain, $locale);`
	`71`	`+ } else {`
	`72`	`+ $trans = $this->translator->transChoice($id, $number, $parameters, $domain, $locale);`
`71`	`73`	`}`
`72`	`74`
`73`		`- $trans = $this->translator->transChoice($id, $number, $parameters, $domain, $locale);`
`74`		`-`
`75`	`75`	`$this->collectMessage($locale, $domain, $id, $trans, ['%count%' => $number] + $parameters);`
`76`	`76`
`77`	`77`	`return $trans;`