bug #31599 [Translation] Fixed issue with new vs old TranslatorInterface in TranslationDataCollector (althaus)

nicolas-grekas · nicolas-grekas · commit 451b4406d2d0 · 2019-05-23T17:21:24.000+02:00
This PR was submitted for the master branch but it was squashed and merged into the 4.2 branch instead (closes #31599). Discussion ---------- [Translation] Fixed issue with new vs old TranslatorInterface in TranslationDataCollector I'm not sure when this gets executed, but overriding `$trans` directly after the `if` simply looks wrong. | Q | A | ------------- | --- | Branch? | 4.3-beta2, but last change at that position is a couple of months | Bug fix? | yes, me thinks | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT Cheers Matthias Commits ------- a1677c7 [Translation] Fixed issue with new vs old TranslatorInterface in TranslationDataCollector
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;`