Move back i18n init in FreshRSS.php

2 files changed, 4 insertions, 4 deletions

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index b997433bf..6114a5d1a 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -26,6 +26,10 @@ class FreshRSS extends Minz_FrontController {
 		// Load context and configuration.
 		FreshRSS_Context::init();
 
+		// Init i18n.
+		Minz_Session::_param('language', FreshRSS_Context::$conf->language);
+		Minz_Translate::init();
+
 		$this->loadStylesAndScripts();
 		$this->loadNotifications();
 		$this->loadExtensions();
diff --git a/app/Models/Context.php b/app/Models/Context.php
index 4580a4f52..3b3c8673d 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -42,10 +42,6 @@ class FreshRSS_Context {
 			die($e->getMessage());
 		}
 
-		// Init i18n.
-		Minz_Session::_param('language', self::$conf->language);
-		Minz_Translate::init();
-
 		$catDAO = new FreshRSS_CategoryDAO();
 		$entryDAO = FreshRSS_Factory::createEntryDao();