diff options
Diffstat (limited to 'app/Model')
| -rw-r--r-- | app/Model/LanguageModel.php | 6 | ||||
| -rw-r--r-- | app/Model/TimezoneModel.php | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/app/Model/LanguageModel.php b/app/Model/LanguageModel.php index 6d46a2fa..09893690 100644 --- a/app/Model/LanguageModel.php +++ b/app/Model/LanguageModel.php @@ -174,11 +174,7 @@ class LanguageModel extends Base */ public function getCurrentLanguage() { - if ($this->userSession->isLogged() && ! empty($this->sessionStorage->user['language'])) { - return $this->sessionStorage->user['language']; - } - - return $this->configModel->get('application_language', 'en_US'); + return $this->userSession->getLanguage() ?: $this->configModel->get('application_language', 'en_US'); } /** diff --git a/app/Model/TimezoneModel.php b/app/Model/TimezoneModel.php index 8b3e895a..ef6afc6a 100644 --- a/app/Model/TimezoneModel.php +++ b/app/Model/TimezoneModel.php @@ -39,11 +39,7 @@ class TimezoneModel extends Base */ public function getCurrentTimezone() { - if ($this->userSession->isLogged() && ! empty($this->sessionStorage->user['timezone'])) { - return $this->sessionStorage->user['timezone']; - } - - return $this->configModel->get('application_timezone', 'UTC'); + return $this->userSession->getTimezone() ?: $this->configModel->get('application_timezone', 'UTC'); } /** |