From 965734e857d36fcb3c981b4791d74eb50a60ad0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Kr=C3=A4utli?= <pkraeutli@astina.ch>
Date: Sun, 14 Oct 2012 11:56:29 +0200
Subject: [PATCH] fixed fallback locale

---
 src/Symfony/Component/Locale/Locale.php           | 6 +-----
 src/Symfony/Component/Locale/Tests/LocaleTest.php | 9 +++++++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/Locale/Locale.php b/src/Symfony/Component/Locale/Locale.php
index 577f33fcd5f8..6982a81a9fef 100644
--- 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
index 7d8aa0eda282..79de3d4dc417 100644
--- 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');