From 4fdfd54f87cb7e7384ff0b735887f80eb0553ba3 Mon Sep 17 00:00:00 2001 From: djmaze Date: Fri, 19 Nov 2021 15:31:30 +0100 Subject: [PATCH] Bugfix: use detected language on first login --- snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php index 1c65ae1fa..686741b44 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -968,7 +968,9 @@ class Actions if ($oSettings instanceof Settings) { if ($oConfig->Get('webmail', 'allow_languages_on_settings', true)) { - $sLanguage = (string)$oSettings->GetConf('Language', $sLanguage); + $sLanguage = (string)$oSettings->GetConf('Language', + $oConfig->Get('login', 'determine_user_language', true) ? $UserLanguageRaw : $sLanguage + ); } $aResult['EditorDefaultType'] = (string)$oSettings->GetConf('EditorDefaultType', $aResult['EditorDefaultType']); @@ -1001,8 +1003,7 @@ class Actions } } else { - if ($oConfig->Get('login', 'allow_languages_on_login', true) - && $oConfig->Get('login', 'determine_user_language', true)) { + if ($oConfig->Get('login', 'allow_languages_on_login', true) && $oConfig->Get('login', 'determine_user_language', true)) { $sLanguage = $this->ValidateLanguage($UserLanguageRaw, $sLanguage, false); }