diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-02-09 09:58:05 -0800 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-02-09 09:58:05 -0800 |
| commit | e68cf72458e9cfb888ef8b24d3e255fadf6d18a7 (patch) | |
| tree | ec3a231409c89bd74869226b785ecd4046a2b33a /lib/base.php | |
| parent | 2a650bcbe9d0875898d26a41864a6a80248e9826 (diff) | |
| parent | 232a98524cdc9c97ad1c5a72ec0021e4b036a69d (diff) | |
| download | nextcloud-server-e68cf72458e9cfb888ef8b24d3e255fadf6d18a7.tar.gz nextcloud-server-e68cf72458e9cfb888ef8b24d3e255fadf6d18a7.zip | |
Merge pull request #1543 from owncloud/utf8-locale-master
some systems use en_US.UTF8 instead of en_US.UTF-8
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php index 5bca1cde2d5..3de38258d03 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') { |