Merge pull request #961 from owncloud/check_locale

add a check and a warning if setlocale is working

4 files changed, 32 insertions, 0 deletions

diff --git a/lib/base.php b/lib/base.php
index 0b75f6f085e..9cdadbb7991 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -474,6 +474,11 @@ class OC{
 				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);
+		}
 	}
 
 	/**
diff --git a/lib/util.php b/lib/util.php
index 3e59847f538..4d69f3d86db 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -554,6 +554,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
          */
 	public static function isinternetconnectionworking() {
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">