From ce10f482748c9819d8e372487010f656c3683db8 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Tue, 6 Jan 2015 23:20:54 +0100 Subject: Fix a bug in i18n init See https://github.com/FreshRSS/FreshRSS/issues/730 --- app/FreshRSS.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'app/FreshRSS.php') 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() { -- cgit v1.2.3