wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #18553 from owncloud/write-l10n-on-login

Browse source 
Save detected l10n of browser on login
This commit is contained in:
Thomas Müller 2015-08-26 08:44:25 +02:00
commit 749e3d5219
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/private/l10n.php
View file

@ -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;
}
/**