diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2013-11-08 14:30:08 +0100 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2013-11-08 14:30:08 +0100 |
| commit | a6d8854d2af234d0613467f12b45f229e0431b35 (patch) | |
| tree | 8ffbe477a97b4f354a874c367604ccb8efc3d0e3 /lib | |
| parent | 4459d964d6af1f9a1c12e3132b8609fc0f40dc98 (diff) | |
| download | nextcloud-server-a6d8854d2af234d0613467f12b45f229e0431b35.tar.gz nextcloud-server-a6d8854d2af234d0613467f12b45f229e0431b35.zip | |
Make working en_US.UTF-8 locale a hard requirement
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 8 | ||||
| -rwxr-xr-x | lib/private/util.php | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/lib/base.php b/lib/base.php index 4f8d97ac95d..cf9230c367e 100644 --- a/lib/base.php +++ b/lib/base.php @@ -241,7 +241,7 @@ class OC { $minimizerCSS->clearCache(); $minimizerJS = new OC_Minimizer_JS(); $minimizerJS->clearCache(); - OC_Util::addscript('update'); + OC_Util::addScript('update'); $tmpl = new OC_Template('', 'update.admin', 'guest'); $tmpl->assign('version', OC_Util::getVersionString()); $tmpl->printPage(); @@ -564,12 +564,6 @@ 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/en_US.UTF8 failed. Support is probably not installed on your system', - OC_Log::ERROR); - } if (OC_Config::getValue('installed', false) && !self::checkUpgrade(false)) { if (OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') { OC_Util::addScript('backgroundjobs'); diff --git a/lib/private/util.php b/lib/private/util.php index 176eb4bc369..f285f83cf5c 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -353,6 +353,13 @@ class OC_Util { $errors = array_merge($errors, self::checkDataDirectoryPermissions($CONFIG_DATADIRECTORY)); } + if(!OC_Util::isSetLocaleWorking()) { + $errors[] = array( + 'error' => 'Setting locale to en_US.UTF-8/en_US.UTF8 failed', + 'hint' => 'Please install the locale on your system and restart your webserver.' + ); + } + $moduleHint = "Please ask your server administrator to install the module."; // check if all required php modules are present if(!class_exists('ZipArchive')) { |