Collect locale details earlier in the process in TranslationDataCollector

pierredup · pierredup · commit 5c394eeb79e4 · 2019-06-03T16:21:58.000+02:00
diff --git a/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php b/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php
@@ -36,12 +36,9 @@ public function lateCollect()
     {
         $messages = $this->sanitizeCollectedMessages($this->translator->getCollectedMessages());
 
-        $this->data = $this->computeCount($messages);
+        $this->data += $this->computeCount($messages);
         $this->data['messages'] = $messages;
 
-        $this->data['locale'] = $this->translator->getLocale();
-        $this->data['fallback_locales'] = $this->translator->getFallbackLocales();
-
         $this->data = $this->cloneVar($this->data);
     }
 
@@ -50,6 +47,8 @@ public function lateCollect()
      */
     public function collect(Request $request, Response $response, \Exception $exception = null)
     {
+        $this->data['locale'] = $this->translator->getLocale();
+        $this->data['fallback_locales'] = $this->translator->getFallbackLocales();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,9 @@ public function lateCollect()`
`36`	`36`	`{`
`37`	`37`	`$messages = $this->sanitizeCollectedMessages($this->translator->getCollectedMessages());`
`38`	`38`
`39`		`- $this->data = $this->computeCount($messages);`
	`39`	`+ $this->data += $this->computeCount($messages);`
`40`	`40`	`$this->data['messages'] = $messages;`
`41`	`41`
`42`		`- $this->data['locale'] = $this->translator->getLocale();`
`43`		`- $this->data['fallback_locales'] = $this->translator->getFallbackLocales();`
`44`		`-`
`45`	`42`	`$this->data = $this->cloneVar($this->data);`
`46`	`43`	`}`
`47`	`44`
`@@ -50,6 +47,8 @@ public function lateCollect()`
`50`	`47`	`*/`
`51`	`48`	`public function collect(Request $request, Response $response, \Exception $exception = null)`
`52`	`49`	`{`
	`50`	`+ $this->data['locale'] = $this->translator->getLocale();`
	`51`	`+ $this->data['fallback_locales'] = $this->translator->getFallbackLocales();`
`53`	`52`	`}`
`54`	`53`
`55`	`54`	`/**`