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

Make default language configurable via config.php

This commit is contained in:
Lennart Rosam 2013-08-02 09:41:31 +02:00
parent 16726ab793
commit 79351d064f
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/config.sample.php
View File

@ -56,6 +56,9 @@ $CONFIG = array(
/* Theme to use for ownCloud */ /* Theme to use for ownCloud */
"theme" => "", "theme" => "",
/* 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 */ /* Path to the parent directory of the 3rdparty directory */
"3rdpartyroot" => "", "3rdpartyroot" => "",
@ -154,7 +157,7 @@ $CONFIG = array(
/* Enable/disable X-Frame-Restriction */ /* Enable/disable X-Frame-Restriction */
/* HIGH SECURITY RISK IF DISABLED*/ /* HIGH SECURITY RISK IF DISABLED*/
"xframe_restriction" => true, "xframe_restriction" => true,
/* The directory where the user data is stored, default to data in the owncloud /* 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. * directory. The sqlite database is also stored here, when sqlite is used.
*/ */

6
lib/l10n.php
View File

@ -298,6 +298,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'])) { if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
$accepted_languages = preg_split('/,\s*/', strtolower($_SERVER['HTTP_ACCEPT_LANGUAGE'])); $accepted_languages = preg_split('/,\s*/', strtolower($_SERVER['HTTP_ACCEPT_LANGUAGE']));
if(is_array($app)) { if(is_array($app)) {