diff options
| author | Robert | 2017-05-09 17:01:16 +0200 |
|---|---|---|
| committer | Robert | 2017-05-09 17:01:16 +0200 |
| commit | 1c9e056f078e89ddfbe1d3c06ce00a4035d4ef98 (patch) | |
| tree | aec4a6003c02c8e12055a5df5c6b41abed4aaa70 /app/controllers/application_controller.rb | |
| parent | 85c6f283fb3cbff9a937ebe6d74f8ed0499c27ef (diff) | |
| parent | c007b5f1442b903948373337a6cc7d7d42364b41 (diff) | |
| download | chouette-core-1c9e056f078e89ddfbe1d3c06ce00a4035d4ef98.tar.bz2 | |
Manual Conflict Resolution
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index f2c9b4c6f..42b7c2a25 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -12,7 +12,10 @@ class ApplicationController < ActionController::Base helper LanguageEngine::Engine.helpers def set_locale - I18n.locale = session[:language] || I18n.default_locale + # I18n.locale = session[:language] || I18n.default_locale + # For testing different locales w/o restarting the server + I18n.locale = (params['lang'] || session[:language] || I18n.default_locale).to_sym + logger.info "locale set to #{I18n.locale.inspect}" end def pundit_user |