Jelajahi Sumber

[GENERIC] Zend_Locale:

- added rerouting for splitted locale

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@19258 44c647ce-9c0f-0410-b52a-842ac1e357ba
thomas 16 tahun lalu
induk
melakukan
427edceb52
2 mengubah file dengan 3 tambahan dan 4 penghapusan
  1. 1 4
      library/Zend/Locale.php
  2. 2 0
      tests/Zend/LocaleTest.php

+ 1 - 4
library/Zend/Locale.php

@@ -819,10 +819,7 @@ class Zend_Locale
             $locale = new Zend_Locale($locale);
             $locale = new Zend_Locale($locale);
         }
         }
 
 
-        if ($locale instanceof Zend_Locale) {
-            $locale = $locale->toString();
-        }
-
+        $locale = self::_prepareLocale($locale);
         return $locale;
         return $locale;
     }
     }
 
 

+ 2 - 0
tests/Zend/LocaleTest.php

@@ -816,6 +816,8 @@ class Zend_LocaleTest extends PHPUnit_Framework_TestCase
 
 
         $locale = new Zend_LocaleTestHelper('de_Latn_DE');
         $locale = new Zend_LocaleTestHelper('de_Latn_DE');
         $this->assertEquals('de_DE', $locale->toString());
         $this->assertEquals('de_DE', $locale->toString());
+
+        $this->assertEquals('fr_FR', Zend_Locale::findLocale('fr-Arab-FR'));
     }
     }
 
 
     /**
     /**