Merge pull request zendframework#1821 from vnagara/fix/fix_translator…

…_fallback_locales_ fix fallback locales setter/getter.
akandels · Jul 9, 2012 · 65f48f6 · 65f48f6
2 parents bc59012 + ce1469c
commit 65f48f6
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/library/Zend/I18n/Translator/Translator.php b/library/Zend/I18n/Translator/Translator.php
@@ -218,7 +218,7 @@ public function getLocale()
      */
     public function setFallbackLocale($locale)
     {
-        $this->locale = $locale;
+        $this->fallbackLocale= $locale;
         return $this;
     }
 
@@ -229,11 +229,11 @@ public function setFallbackLocale($locale)
      */
     public function getFallbackLocale()
     {
-        if ($this->locale === null) {
-            $this->locale = Locale::getDefault();
+        if ($this->fallbackLocale === null) {
+            $this->fallbackLocale = Locale::getDefault();
         }
 
-        return $this->locale;
+        return $this->fallbackLocale;
     }
 
     /**