fixing Locale on windows + skip

1 files changed, 16 insertions, 4 deletions

diff --git a/core/Intl/Locale.php b/core/Intl/Locale.php
index 5b284d5a97..5ff2329d97 100644
--- a/core/Intl/Locale.php
+++ b/core/Intl/Locale.php
@@ -12,14 +12,26 @@ class Locale
 {
     public static function setLocale($locale)
     {
-        $localeVariant = str_replace('UTF-8', 'UTF8', $locale);
-
-        setlocale(LC_ALL, $locale, $localeVariant);
+        if(!is_array($locale)){
+            $locale = array($locale);
+        }
+        
+        $newLocale = array();
+        foreach($locale as $localePart){
+            $newLocale[] = $localePart;
+            
+            $localeVariant = str_replace('UTF-8', 'UTF8', $localePart);
+            if($localeVariant != $localePart){
+                $newLocale[] = $localeVariant;
+            }
+        }
+        
+        setlocale(LC_ALL, $newLocale);
         setlocale(LC_CTYPE, '');
     }
 
     public static function setDefaultLocale()
     {
-        self::setLocale('en_US.UTF-8');
+        self::setLocale(['en_US.UTF-8', 'en-US']);
     }
 }