[Translation] fixed previous merge

symfony · Sep 20, 2011 · 774ac80 · 774ac80
1 parent 01a24db
commit 774ac80
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
@@ -182,10 +182,6 @@ private function loadFallbackCatalogues($locale)
     {
         $current = $this->catalogues[$locale];
         foreach ($this->computeFallbackLocales($locale) as $fallback) {
-            if ($fallback === $locale) {
-                continue;
-            }
-
             if (!isset($this->catalogues[$fallback])) {
                 $this->doLoadCatalogue($fallback);
             }
@@ -197,7 +193,14 @@ private function loadFallbackCatalogues($locale)
 
     private function computeFallbackLocales($locale)
     {
-        $locales = $this->fallbackLocales;
+        $locales = array();
+        foreach ($this->fallbackLocales as $fallback) {
+            if ($fallback === $locale) {
+                continue;
+            }
+
+            $locales[] = $fallback;
+        }
 
         if (strlen($locale) > 3) {
             array_unshift($locales, substr($locale, 0, -strlen(strrchr($locale, '_'))));