diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-02-08 17:49:54 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-02-08 17:49:54 +0100 |
| commit | 232a98524cdc9c97ad1c5a72ec0021e4b036a69d (patch) | |
| tree | 92599b5c1f4d0cc707ee3293008dee3c76022fb8 /lib | |
| parent | 96042f1e5b343ed75f59fc2997b7e54c07b557da (diff) | |
| download | nextcloud-server-232a98524cdc9c97ad1c5a72ec0021e4b036a69d.tar.gz nextcloud-server-232a98524cdc9c97ad1c5a72ec0021e4b036a69d.zip | |
some systems use en_US.UTF8 instead of en_US.UTF-8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 4 | ||||
| -rwxr-xr-x | lib/util.php | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/lib/base.php b/lib/base.php index 5bfdb0b7c0a..38ced09b81d 100644 --- 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 9ce974619bc..27aea6996da 100755 --- 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; } /** |