Make default language configurable via config.php

Conflicts:
	config/config.sample.php

diff --git a/config/config.sample.php b/config/config.sample.php
index aa81cb781a21932c1563035847f823ade66e6b34..4a1eee331c974194093a25d709bb3ed76fe3ba24 100644 (file)
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -56,7 +56,10 @@ $CONFIG = array(
 /* Theme to use for ownCloud */
 "theme" => "",
 
-/* Path to the 3rdparty directory */
+/* Optional ownCLoud default language - overrides automatic language detection on public pages like login or shared items. This has no effect on the users's language preference configured under "personal -> language" once they have logged in */
+"default_language" => "en",
+
+/* Path to the parent directory of the 3rdparty directory */
 "3rdpartyroot" => "",
 
 /* URL to the 3rdparty directory, as seen by the browser */
@@ -144,7 +147,7 @@ $CONFIG = array(
 /* Enable/disable X-Frame-Restriction */
 /* HIGH SECURITY RISK IF DISABLED*/
 "xframe_restriction" => true,
-       
+
 /* The directory where the user data is stored, default to data in the owncloud
  * directory. The sqlite database is also stored here, when sqlite is used.
  */

diff --git a/lib/l10n.php b/lib/l10n.php
index 1e07a9b9557c1063dbeb229c450998ee3869c419..6d930994e7b7a30c33de8cb8d02de8ee9a315e22 100644 (file)
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -286,6 +286,12 @@ class OC_L10N{
                        }
                }
 
+    $default_language = OC_Config::getValue('default_language', false);
+
+    if($default_language !== false) {
+      return $default_language;
+    }
+
                if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
                        $accepted_languages = preg_split('/,\s*/', strtolower($_SERVER['HTTP_ACCEPT_LANGUAGE']));
                        if(is_array($app)) {