aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorMichel Etienne2012-09-05 13:10:18 +0200
committerMichel Etienne2012-09-05 13:10:18 +0200
commit31f1039ac32772175ad11682340623bc9e33ab80 (patch)
treea3ce6a8cd281af28dafb3ac6e97973acded5fa34 /app/controllers/application_controller.rb
parent4cdde531b029a865c112a0f0903da6c13ec4d20a (diff)
downloadchouette-core-31f1039ac32772175ad11682340623bc9e33ab80.tar.bz2
workaround for i18n
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 8cde89db0..7e7b9b890 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,7 +1,12 @@
class ApplicationController < ActionController::Base
protect_from_forgery
before_filter :authenticate_user!
-
+ before_filter :set_locale
+
+ def set_locale
+ I18n.locale = session[:language] || I18n.default_locale
+ end
+
protected
def current_organisation