diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2013-11-15 14:46:00 +0100 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2013-11-15 14:46:00 +0100 |
| commit | 368342a085cd33d6f6ea9fa037b9695c82571992 (patch) | |
| tree | c04d99f8a19c8bbde170e5d80a8fc2749251245b | |
| parent | bcf56b04078f4a8b9381f110c379b0d33d0db48c (diff) | |
| download | nextcloud-server-368342a085cd33d6f6ea9fa037b9695c82571992.tar.gz nextcloud-server-368342a085cd33d6f6ea9fa037b9695c82571992.zip | |
Update error messages
| -rwxr-xr-x | lib/private/util.php | 2 | ||||
| -rwxr-xr-x | settings/admin.php | 2 | ||||
| -rw-r--r-- | settings/templates/admin.php | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/private/util.php b/lib/private/util.php index d44ae09ecbc..115deaceb56 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -355,7 +355,7 @@ class OC_Util { if(!OC_Util::isSetLocaleWorking()) { $errors[] = array( - 'error' => 'Setting locale to en_US.UTF-8/en_US.UTF8 failed', + 'error' => 'Setting locale to en_US.UTF-8/fr_FR.UTF-8/es_ES.UTF-8/de_DE.UTF-8/ru_RU.UTF-8/pt_BR.UTF-8/it_IT.UTF-8/ja_JP.UTF-8/zh_CN.UTF-8 failed', 'hint' => 'Please install the locale on your system and restart your webserver.' ); } diff --git a/settings/admin.php b/settings/admin.php index 120f15bec19..0d3868afea8 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -25,7 +25,7 @@ $tmpl->assign('entries', $entries); $tmpl->assign('entriesremain', $entriesremain); $tmpl->assign('htaccessworking', $htaccessworking); $tmpl->assign('internetconnectionworking', OC_Util::isInternetConnectionEnabled() ? OC_Util::isInternetConnectionWorking() : false); -$tmpl->assign('islocaleworking', OC_Util::isSetLocaleWorking()); +$tmpl->assign('isLocaleWorking', OC_Util::isSetLocaleWorking()); $tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking()); $tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded()); $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax')); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 5413b700936..66bcfa21c3f 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -59,14 +59,14 @@ if (!$_['has_fileinfo']) { } // is locale working ? -if (!$_['islocaleworking']) { +if (!$_['isLocaleWorking']) { ?> <fieldset class="personalblock"> <h2><?php p($l->t('Locale not working'));?></h2> <span class="connectionwarning"> <?php - $locales = 'en_US.UTF-8/en_US.UTF8'; + $locales = 'en_US.UTF-8/fr_FR.UTF-8/es_ES.UTF-8/de_DE.UTF-8/ru_RU.UTF-8/pt_BR.UTF-8/it_IT.UTF-8/ja_JP.UTF-8/zh_CN.UTF-8'; p($l->t('System locale can\'t be set to %s. 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 %s.', array($locales, $locales))); ?> </span> |