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 | |
| 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
| -rw-r--r-- | lib/base.php | 4 | ||||
| -rwxr-xr-x | lib/util.php | 11 | ||||
| -rw-r--r-- | settings/templates/admin.php | 2 |
3 files changed, 8 insertions, 9 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') { diff --git a/lib/util.php b/lib/util.php index 49d914e5fbd..a5fe4cb175a 100755 --- a/lib/util.php +++ b/lib/util.php @@ -560,12 +560,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 fac8a689883..17be3396930 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -58,7 +58,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> |