Merge pull request #961 from owncloud/check_locale

add a check and a warning if setlocale is working

2 files changed, 17 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() {