mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #961 from owncloud/check_locale 

add a check and a warning if setlocale is working
This commit is contained in:
Frank Karlitschek 2012-12-19 08:53:43 -08:00
parent d7fbe47583 196f1c3786
commit b162e72f94
4 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/base.php
View File

@ -474,6 +474,11 @@ class OC{
exit; exit;
} }
} }
// write error into log if locale can't be set
if(OC_Util::issetlocaleworking()==false) {
OC_Log::write('core', 'setting locate to en_US.UTF-8 failed. Support is probably not installed on your system', OC_Log::ERROR);
}
} }
/** /**

12
lib/util.php
View File

@ -553,6 +553,18 @@ class OC_Util {
} }
/**
* Check if the setlocal call doesn't work. This can happen if the right local packages are not available on the server.
*/
public static function issetlocaleworking() {
$result=setlocale(LC_ALL, 'en_US.UTF-8');
if($result==false) {
return(false);
}else{
return(true);
}
}
/** /**
* Check if the ownCloud server can connect to the internet * Check if the ownCloud server can connect to the internet
*/ */

1
settings/admin.php
View File

@ -30,6 +30,7 @@ $tmpl->assign('entries', $entries);
$tmpl->assign('entriesremain', $entriesremain); $tmpl->assign('entriesremain', $entriesremain);
$tmpl->assign('htaccessworking', $htaccessworking); $tmpl->assign('htaccessworking', $htaccessworking);
$tmpl->assign('internetconnectionworking', OC_Util::isinternetconnectionworking()); $tmpl->assign('internetconnectionworking', OC_Util::isinternetconnectionworking());
$tmpl->assign('islocaleworking', OC_Util::issetlocaleworking());
$tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax')); $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax'));
$tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes')); $tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes'));
$tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes')); $tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes'));

16
settings/templates/admin.php
View File

@ -8,6 +8,7 @@ $levels=array('Debug','Info','Warning','Error', 'Fatal');
<?php <?php
// is htaccess working ?
if(!$_['htaccessworking']) { if(!$_['htaccessworking']) {
?> ?>
<fieldset class="personalblock"> <fieldset class="personalblock">
@ -20,9 +21,22 @@ if(!$_['htaccessworking']) {
</fieldset> </fieldset>
<?php <?php
} }
?>
// is locale working ?
if(!$_['islocaleworking']) {
?>
<fieldset class="personalblock">
<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 caracters in file names. We strongly suggest to install the requirend packages on your system to support en_US.UTF-8.'); ?>
</span>
</fieldset>
<?php <?php
}
// is internet connection working ?
if(!$_['internetconnectionworking']) { if(!$_['internetconnectionworking']) {
?> ?>
<fieldset class="personalblock"> <fieldset class="personalblock">