some systems use en_US.UTF8 instead of en_US.UTF-8

diff --git a/lib/base.php b/lib/base.php
index 5bfdb0b7c0a568f893d864b3e31c51f0a0580733..38ced09b81de25379fee22159503acf6143d95a3 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -346,7 +346,7 @@ class OC {
        public static function init() {
                // register autoloader
                spl_autoload_register(array('OC', 'autoload'));
-               setlocale(LC_ALL, 'en_US.UTF-8');
+               OC_Util::issetlocaleworking();
 
                // set some stuff
                //ob_start();
@@ -498,7 +498,7 @@ class OC {
 
                // write error into log if locale can't be set
                if (OC_Util::issetlocaleworking() == false) {
-                       OC_Log::write('core', 'setting locale to en_US.UTF-8 failed. Support is probably not installed on your system', OC_Log::ERROR);
+                       OC_Log::write('core', 'setting locale to en_US.UTF-8/en_US.UTF8 failed. Support is probably not installed on your system', OC_Log::ERROR);
                }
                if (OC_Config::getValue('installed', false)) {
                        if (OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') {

diff --git a/lib/util.php b/lib/util.php
index 9ce974619bcee2a496e0785f63bd5cf9cc90020a..27aea6996dac4e9a861d27aa3becae5d17c69c54 100755 (executable)
--- a/lib/util.php
+++ b/lib/util.php
@@ -526,12 +526,11 @@ class OC_Util {
                        return true;
                }
 
-               $result=setlocale(LC_ALL, 'en_US.UTF-8');
-               if($result==false) {
-                       return(false);
-               }else{
-                       return(true);
-               }
+               $result = setlocale(LC_ALL, 'en_US.UTF-8', 'en_US.UTF8');
+               if($result == false) {
+                       return false;
+        }
+        return true;
        }
 
        /**

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 9a9a691dcbfa5569f6331d21910054bbc81eac9b..32fc2694783f5d3129c67446de386a8e6b63f10e 100644 (file)
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -42,7 +42,7 @@ if (!$_['islocaleworking']) {
        <legend><strong><?php echo $l->t('Locale not working');?></strong></legend>
 
                <span class="connectionwarning">
-               <?php echo $l->t('This ownCloud server can\'t set system locale to "en_US.UTF-8". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8.'); ?>
+               <?php echo $l->t('This ownCloud server can\'t set system locale to "en_US.UTF-8"/"en_US.UTF8". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8/en_US.UTF8.'); ?>
        </span>
 
 </fieldset>