From 196f1c3786ca009b3180e8ca11d0bf0258f5be92 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Wed, 19 Dec 2012 15:10:33 +0100
Subject: add a check and a warning if setlocale is working

---
 settings/admin.php           |  1 +
 settings/templates/admin.php | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

(limited to 'settings')

diff --git a/settings/admin.php b/settings/admin.php
index 0cf449ef2ba..04905391138 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -30,6 +30,7 @@ $tmpl->assign('entries', $entries);
 $tmpl->assign('entriesremain', $entriesremain);
 $tmpl->assign('htaccessworking', $htaccessworking);
 $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('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes'));
 $tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes'));
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index a110e09b692..a8e3375ab24 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -8,6 +8,7 @@ $levels=array('Debug','Info','Warning','Error', 'Fatal');
 
 <?php
 
+// is htaccess working ?
 if(!$_['htaccessworking']) {
 ?>
 <fieldset class="personalblock">
@@ -20,9 +21,22 @@ if(!$_['htaccessworking']) {
 </fieldset>	
 <?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
+}
+
+// is internet connection working ?
 if(!$_['internetconnectionworking']) {
 ?>
 <fieldset class="personalblock">
-- 
cgit v1.2.3