Fix i18n loading and availableLanguages calls

- Change the way to init i18n
- Add a availableLanguages() method to Minz_Translate

See https://github.com/FreshRSS/FreshRSS/issues/730

1 files changed, 14 insertions, 4 deletions

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index a53174394..7b5df7ced 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -31,15 +31,25 @@ class FreshRSS extends Minz_FrontController {
 		// Load context and configuration.
 		FreshRSS_Context::init();
 
-		// Init i18n.
-		Minz_Session::_param('language', FreshRSS_Context::$user_conf->language);
-		Minz_Translate::init();
-
+		$this->initI18n();
 		$this->loadStylesAndScripts();
 		$this->loadNotifications();
 		$this->loadExtensions();
 	}
 
+	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_Translate::init(array(
+			'en' => 'English',
+			'fr' => 'Français',
+		), $lang);
+	}
+
 	private function loadStylesAndScripts() {
 		$theme = FreshRSS_Themes::load(FreshRSS_Context::$user_conf->theme);
 		if ($theme) {