From 9a9c83b2a40c1612800a327a1d337668fbe6c775 Mon Sep 17 00:00:00 2001 From: Abdellatif Ait boudad Date: Thu, 16 Apr 2015 11:20:34 +0100 Subject: [PATCH] [2.7][Translation] remove duplicate code for loading catalogue. --- .../Component/Translation/DataCollectorTranslator.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Symfony/Component/Translation/DataCollectorTranslator.php b/src/Symfony/Component/Translation/DataCollectorTranslator.php index d4a046ec434a7..813a85760ae14 100644 --- 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)) {