[Locale] fixed fallback locale

pkraeutli · pkraeutli · commit 96d87adb70a8 · 2012-10-14T11:56:29.000+02:00
diff --git a/src/Symfony/Component/Locale/Locale.php b/src/Symfony/Component/Locale/Locale.php
@@ -285,12 +285,8 @@ public static function getIcuDataDirectory()
      */
     protected static function getFallbackLocale($locale)
     {
-        if ($locale === self::getDefault()) {
-            return null;
-        }
-
         if (false === $pos = strrpos($locale, '_')) {
-            return self::getDefault();
+            return null;
         }
 
         return substr($locale, 0, $pos);
diff --git a/src/Symfony/Component/Locale/Tests/LocaleTest.php b/src/Symfony/Component/Locale/Tests/LocaleTest.php
@@ -19,6 +19,9 @@ class LocaleTest extends LocaleTestCase
     public function testGetDisplayCountriesReturnsFullListForSubLocale()
     {
         $this->skipIfIntlExtensionIsNotLoaded();
+
+        Locale::setDefault('de_CH');
+
         $countriesDe = Locale::getDisplayCountries('de');
         $countriesDeCh = Locale::getDisplayCountries('de_CH');
 
@@ -30,6 +33,9 @@ public function testGetDisplayCountriesReturnsFullListForSubLocale()
     public function testGetDisplayLanguagesReturnsFullListForSubLocale()
     {
         $this->skipIfIntlExtensionIsNotLoaded();
+
+        Locale::setDefault('de_CH');
+
         $languagesDe = Locale::getDisplayLanguages('de');
         $languagesDeCh = Locale::getDisplayLanguages('de_CH');
 
@@ -41,6 +47,9 @@ public function testGetDisplayLanguagesReturnsFullListForSubLocale()
     public function testGetDisplayLocalesReturnsFullListForSubLocale()
     {
         $this->skipIfIntlExtensionIsNotLoaded();
+
+        Locale::setDefault('de_CH');
+
         $localesDe = Locale::getDisplayLocales('de');
         $localesDeCh = Locale::getDisplayLocales('de_CH');
 

Original file line number	Diff line number	Diff line change
`@@ -285,12 +285,8 @@ public static function getIcuDataDirectory()`
`285`	`285`	`*/`
`286`	`286`	`protected static function getFallbackLocale($locale)`
`287`	`287`	`{`
`288`		`- if ($locale === self::getDefault()) {`
`289`		`- return null;`
`290`		`- }`
`291`		`-`
`292`	`288`	`if (false === $pos = strrpos($locale, '_')) {`
`293`		`- return self::getDefault();`
	`289`	`+ return null;`
`294`	`290`	`}`
`295`	`291`
`296`	`292`	`return substr($locale, 0, $pos);`