Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-07-25 13:54:59 +02:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

Update error messages

Browse Source
This commit is contained in:
Bart Visscher 2013-11-15 14:46:00 +01:00
parent bcf56b0407
commit 368342a085
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/util.php
View File

@ -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.'
);
}

2
settings/admin.php
View File

@ -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'));

4
settings/templates/admin.php
View File

@ -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>