aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/help_controller.rb
diff options
context:
space:
mode:
authorMichel Etienne2014-11-04 15:02:14 +0100
committerMichel Etienne2014-11-04 15:02:14 +0100
commitdb89e7c94cbf7fdea3d46dcf37ac643075f79000 (patch)
treeb7903021b2058d31860db2fc351f6fe006c578db /app/controllers/help_controller.rb
parent6841cc3d36990a0ed12c78f371112af9b3590f72 (diff)
parentc9fd03422743d3d716bbd7199184c035c1b0d4c9 (diff)
downloadchouette-core-db89e7c94cbf7fdea3d46dcf37ac643075f79000.tar.bz2
Merge branch 'sismo' of github.com:afimb/chouette2 into sismo
Diffstat (limited to 'app/controllers/help_controller.rb')
-rw-r--r--app/controllers/help_controller.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb
index 91e8088de..7d4c3409d 100644
--- a/app/controllers/help_controller.rb
+++ b/app/controllers/help_controller.rb
@@ -1,4 +1,11 @@
-class HelpController < ApplicationController
+class HelpController < ActionController::Base
+ layout "application"
+ protect_from_forgery
+ before_filter :set_locale
+
+ def set_locale
+ I18n.locale = session[:language] || I18n.default_locale
+ end
def show
@page = HelpPage.find(slug)