minor #14371 [2.7][Translation] remove duplicate code for loading catalogue. (aitboudad)

fabpot · fabpot · commit 03f6c04b73fa · 2015-04-16T18:16:17.000+02:00
This PR was merged into the 2.7 branch. Discussion ---------- [2.7][Translation] remove duplicate code for loading catalogue. | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Fixed tickets | ~ | Tests pass? | yes | License | MIT Commits ------- 9a9c83b [2.7][Translation] remove duplicate code for loading catalogue.
diff --git a/src/Symfony/Component/Translation/DataCollectorTranslator.php b/src/Symfony/Component/Translation/DataCollectorTranslator.php
@@ -116,16 +116,13 @@ public function getCollectedMessages()
      */
     private function collectMessage($locale, $domain, $id, $translation)
     {
-        if (null === $locale) {
-            $locale = $this->getLocale();
-        }
-
         if (null === $domain) {
             $domain = 'messages';
         }
 
         $id = (string) $id;
         $catalogue = $this->translator->getCatalogue($locale);
+        $locale = $catalogue->getLocale();
         if ($catalogue->defines($id, $domain)) {
             $state = self::MESSAGE_DEFINED;
         } elseif ($catalogue->has($id, $domain)) {
