diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-08-26 08:44:25 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-08-26 08:44:25 +0200 |
| commit | 749e3d521921a840030be1b4bbc3f676509085da (patch) | |
| tree | f4bd1c4ca0aa064cb940aab12f9a58f7804faeef | |
| parent | 534b2e407a80405c636b1ebd4486d01b9d3147bd (diff) | |
| parent | 4f13f9698171f8041a443a1c1f0c8fbd4522ca77 (diff) | |
| download | nextcloud-server-749e3d521921a840030be1b4bbc3f676509085da.tar.gz nextcloud-server-749e3d521921a840030be1b4bbc3f676509085da.zip | |
Merge pull request #18553 from owncloud/write-l10n-on-login
Save detected l10n of browser on login
| -rw-r--r-- | lib/private/l10n.php | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/private/l10n.php b/lib/private/l10n.php index d367dbae690..17acaac1692 100644 --- a/lib/private/l10n.php +++ b/lib/private/l10n.php @@ -449,8 +449,11 @@ class OC_L10N implements \OCP\IL10N { return self::$language; } - if(OC_User::getUser() && \OC::$server->getConfig()->getUserValue(OC_User::getUser(), 'core', 'lang')) { - $lang = \OC::$server->getConfig()->getUserValue(OC_User::getUser(), 'core', 'lang'); + $config = \OC::$server->getConfig(); + $userId = \OC_User::getUser(); + + if($userId && $config->getUserValue($userId, 'core', 'lang')) { + $lang = $config->getUserValue($userId, 'core', 'lang'); self::$language = $lang; if(is_array($app)) { $available = $app; @@ -463,13 +466,18 @@ class OC_L10N implements \OCP\IL10N { } } - $default_language = \OC::$server->getConfig()->getSystemValue('default_language', false); + $default_language = $config->getSystemValue('default_language', false); if($default_language !== false) { return $default_language; } - return self::setLanguageFromRequest($app); + $lang = self::setLanguageFromRequest($app); + if($userId && !$config->getUserValue($userId, 'core', 'lang')) { + $config->setUserValue($userId, 'core', 'lang', $lang); + } + + return $lang; } /** |