diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-01-06 23:20:54 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-01-06 23:20:54 +0100 |
| commit | ce10f482748c9819d8e372487010f656c3683db8 (patch) | |
| tree | 70899506c26fa33dd69063969dece435d8a99623 /app/FreshRSS.php | |
| parent | 60563283cc5594f50fd8943661e03e350e529913 (diff) | |
Fix a bug in i18n init
See https://github.com/FreshRSS/FreshRSS/issues/730
Diffstat (limited to 'app/FreshRSS.php')
| -rw-r--r-- | app/FreshRSS.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/FreshRSS.php b/app/FreshRSS.php index 7b5df7ced..06976c88b 100644 --- a/app/FreshRSS.php +++ b/app/FreshRSS.php @@ -38,16 +38,12 @@ class FreshRSS extends Minz_FrontController { } private function initI18n() { - $lang = Minz_Session::param('language'); - if ($lang === false) { - Minz_Session::_param('language', FreshRSS_Context::$user_conf->language); - $lang = FreshRSS_Context::$user_conf->language; - } + Minz_Session::_param('language', FreshRSS_Context::$user_conf->language); Minz_Translate::init(array( 'en' => 'English', 'fr' => 'Français', - ), $lang); + ), FreshRSS_Context::$user_conf->language); } private function loadStylesAndScripts() { |