[Translation] remove duplicate code for loading catalogue.

aitboudad · aitboudad · commit d742a24a7eaf · 2015-04-15T02:08:56.000+01:00
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)) {
diff --git a/src/Symfony/Component/Translation/LoggingTranslator.php b/src/Symfony/Component/Translation/LoggingTranslator.php
@@ -109,10 +109,6 @@ public function __call($method, $args)
      */
     private function log($id, $domain, $locale)
     {
-        if (null === $locale) {
-            $locale = $this->getLocale();
-        }
-
         if (null === $domain) {
             $domain = 'messages';
         }
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
@@ -222,21 +222,11 @@ public function getFallbackLocales()
      */
     public function trans($id, array $parameters = array(), $domain = null, $locale = null)
     {
-        if (null === $locale) {
-            $locale = $this->getLocale();
-        } else {
-            $this->assertValidLocale($locale);
-        }
-
         if (null === $domain) {
             $domain = 'messages';
         }
 
-        if (!isset($this->catalogues[$locale])) {
-            $this->loadCatalogue($locale);
-        }
-
-        return strtr($this->catalogues[$locale]->get((string) $id, $domain), $parameters);
+        return strtr($this->getCatalogue($locale)->get((string) $id, $domain), $parameters);
     }
 
     /**
@@ -246,23 +236,13 @@ public function trans($id, array $parameters = array(), $domain = null, $locale
      */
     public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)
     {
-        if (null === $locale) {
-            $locale = $this->getLocale();
-        } else {
-            $this->assertValidLocale($locale);
-        }
-
         if (null === $domain) {
             $domain = 'messages';
         }
 
-        if (!isset($this->catalogues[$locale])) {
-            $this->loadCatalogue($locale);
-        }
-
         $id = (string) $id;
-
-        $catalogue = $this->catalogues[$locale];
+        $catalogue = $this->getCatalogue($locale);
+        $locale = $catalogue->getLocale();
         while (!$catalogue->defines($id, $domain)) {
             if ($cat = $catalogue->getFallbackCatalogue()) {
                 $catalogue = $cat;
@@ -282,6 +262,8 @@ public function getCatalogue($locale = null)
     {
         if (null === $locale) {
             $locale = $this->getLocale();
+        } else {
+            $this->assertValidLocale($locale);
         }
 
         if (!isset($this->catalogues[$locale])) {
@@ -310,16 +292,8 @@ protected function getLoaders()
      */
     public function getMessages($locale = null)
     {
-        if (null === $locale) {
-            $locale = $this->getLocale();
-        }
-
-        if (!isset($this->catalogues[$locale])) {
-            $this->loadCatalogue($locale);
-        }
-
         $catalogues = array();
-        $catalogues[] = $catalogue = $this->catalogues[$locale];
+        $catalogues[] = $catalogue = $this->getCatalogue($locale);
         while ($catalogue = $catalogue->getFallbackCatalogue()) {
             $catalogues[] = $catalogue;
         }
diff --git a/src/Symfony/Component/Translation/TranslatorBagInterface.php b/src/Symfony/Component/Translation/TranslatorBagInterface.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\Translation;
 
 /**
- * TranslatorBagInterface
+ * TranslatorBagInterface.
  *
  * @author Abdellatif Ait boudad <a.aitboudad@gmail.com>
  */
@@ -23,6 +23,8 @@ interface TranslatorBagInterface
      *
      * @param string|null $locale The locale or null to use the default
      *
+     * @throws \InvalidArgumentException If the locale contains invalid characters
+     *
      * @return MessageCatalogueInterface
      */
     public function getCatalogue($locale = null);

Original file line number	Diff line number	Diff line change
`@@ -109,10 +109,6 @@ public function __call($method, $args)`
`109`	`109`	`*/`
`110`	`110`	`private function log($id, $domain, $locale)`
`111`	`111`	`{`
`112`		`- if (null === $locale) {`
`113`		`- $locale = $this->getLocale();`
`114`		`- }`
`115`		`-`
`116`	`112`	`if (null === $domain) {`
`117`	`113`	`$domain = 'messages';`
`118`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`namespace Symfony\Component\Translation;`
`13`	`13`
`14`	`14`	`/**`
`15`		`- * TranslatorBagInterface`
	`15`	`+ * TranslatorBagInterface.`
`16`	`16`	`*`
`17`	`17`	`* @author Abdellatif Ait boudad <a.aitboudad@gmail.com>`
`18`	`18`	`*/`
`@@ -23,6 +23,8 @@ interface TranslatorBagInterface`
`23`	`23`	`*`
`24`	`24`	`* @param string\|null $locale The locale or null to use the default`
`25`	`25`	`*`
	`26`	`+ * @throws \InvalidArgumentException If the locale contains invalid characters`
	`27`	`+ *`
`26`	`28`	`* @return MessageCatalogueInterface`
`27`	`29`	`*/`
`28`	`30`	`public function getCatalogue($locale = null);`