diff options
| author | Lennart Rosam <lennart.rosam@medien-systempartner.de> | 2013-08-02 11:41:31 +0400 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-08-02 18:30:11 +0400 |
| commit | c9b7820e313fbda07222eda0db85e971b37d9033 (patch) | |
| tree | 1442415173dd4fc27f0b1fbc6bc835b57da4f624 /lib/l10n.php | |
| parent | 9fc995498f6df6834d8846060e30f7346b0cf737 (diff) | |
Make default language configurable via config.php
Conflicts:
config/config.sample.php
Diffstat (limited to 'lib/l10n.php')
| -rw-r--r-- | lib/l10n.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/l10n.php b/lib/l10n.php index 1e07a9b9557..6d930994e7b 100644 --- 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)) { |