diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-08-08 15:24:01 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-08-08 15:24:01 +0100 |
| commit | d5e1fc1c612e8edf6c571d019cf68ba66b3bee64 (patch) | |
| tree | 5df6619a8dc2e887283bac57d43dd51b4a67d3cf /app/controllers/application_controller.rb | |
| parent | 8d079ca778e2905a61c947648d924cb6c4f79724 (diff) | |
Introduce config setting to ignore browser language settings
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 2918f39c0..0d8c83d6c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -42,7 +42,11 @@ class ApplicationController < ActionController::Base end def set_gettext_locale - requested_locale = params[:locale] || session[:locale] || cookies[:locale] || request.env['HTTP_ACCEPT_LANGUAGE'] || I18n.default_locale + if MySociety::Config.get('USE_DEFAULT_BROWSER_LANGUAGE', true) + requested_locale = params[:locale] || session[:locale] || cookies[:locale] || request.env['HTTP_ACCEPT_LANGUAGE'] || I18n.default_locale + else + requested_locale = params[:locale] || session[:locale] || cookies[:locale] || I18n.default_locale + end session[:locale] = FastGettext.set_locale(requested_locale) end |