From 70d75f0cf5304c1f8ef121538f9e4e166bb7b755 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sat, 27 Apr 2013 16:45:16 +0200
Subject: Possibilité de choisir la langue à utiliser + fin traduction en
 anglais (bug #38)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/App_FrontController.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'app/App_FrontController.php')

diff --git a/app/App_FrontController.php b/app/App_FrontController.php
index 177e83b66..8b515873a 100644
--- a/app/App_FrontController.php
+++ b/app/App_FrontController.php
@@ -11,12 +11,12 @@ class App_FrontController extends FrontController {
 		$this->loadModels ();
 
 		Session::init (); // lancement de la session doit se faire après chargement des modèles sinon bug (pourquoi ?)
-		Session::_param ('language', 'fr');
-		Translate::init ();
 
 		$this->loadParamsView ();
 		$this->loadStylesAndScripts ();
 		$this->loadNotifications ();
+
+		Translate::init ();
 	}
 
 	private function loadLibs () {
@@ -41,6 +41,8 @@ class App_FrontController extends FrontController {
 
 		$entryDAO = new EntryDAO ();
 		View::_param ('nb_not_read', $entryDAO->countNotRead ());
+
+		Session::_param ('language', $this->conf->language ());
 	}
 
 	private function loadStylesAndScripts () {
-- 
cgit v1.2.3