|
@@ -203,7 +203,10 @@ class Controller
|
|
|
$lang = $this->_conf->getKey('languagedefault');
|
|
$lang = $this->_conf->getKey('languagedefault');
|
|
|
I18n::setLanguageFallback($lang);
|
|
I18n::setLanguageFallback($lang);
|
|
|
// force default language, if language selection is disabled and a default is set
|
|
// force default language, if language selection is disabled and a default is set
|
|
|
- if (!$this->_conf->getKey('languageselection') && in_array($lang, I18n::getAvailableLanguages(), true)) {
|
|
|
|
|
|
|
+ if (!$this->_conf->getKey('languageselection') && (
|
|
|
|
|
+ in_array($lang, I18n::getAvailableLanguages(), true) ||
|
|
|
|
|
+ $lang === 'en'
|
|
|
|
|
+ )) {
|
|
|
$_COOKIE['lang'] = $lang;
|
|
$_COOKIE['lang'] = $lang;
|
|
|
setcookie('lang', $lang, ['SameSite' => 'Lax', 'Secure' => true]);
|
|
setcookie('lang', $lang, ['SameSite' => 'Lax', 'Secure' => true]);
|
|
|
}
|
|
}
|