diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-08-02 06:49:54 -0700 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-08-02 06:49:54 -0700 |
| commit | 821a99b937cc1c12315d23e805a80496ed54f70d (patch) | |
| tree | bed437ac8b41716b6c4d0fa3d53d705ba6820010 | |
| parent | 90d718634ba0949b35d0c632c4c870d2cefa911e (diff) | |
| parent | ad329f541bc3acf923ee06c9547669b464268679 (diff) | |
| download | nextcloud-server-821a99b937cc1c12315d23e805a80496ed54f70d.tar.gz nextcloud-server-821a99b937cc1c12315d23e805a80496ed54f70d.zip | |
Merge pull request #4287 from Takuto88/language-config
Make default language configurable via config.php
| -rw-r--r-- | config/config.sample.php | 5 | ||||
| -rw-r--r-- | lib/l10n.php | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index 8d978ea6ee7..c6d7fa0d05b 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -56,6 +56,9 @@ $CONFIG = array( /* Theme to use for ownCloud */ "theme" => "", +/* Optional ownCloud default language - overrides automatic language detection on public pages like login or shared items. This has no effect on the user'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" => "", @@ -154,7 +157,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 d35ce5fed14..a28aa89c5f1 100644 --- a/lib/l10n.php +++ b/lib/l10n.php @@ -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'])) { $accepted_languages = preg_split('/,\s*/', strtolower($_SERVER['HTTP_ACCEPT_LANGUAGE'])); if(is_array($app)) { |