diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-01-15 15:19:05 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-01-15 15:19:05 +0000 |
| commit | 5f3418307d6087f848eb1fdbf4531d67416121df (patch) | |
| tree | cb7dad95b6b21db3b237efabc9d0fa37879adc10 /app/controllers/application_controller.rb | |
| parent | 07121bf22b0929e03215f02b8740c3979ae6c872 (diff) | |
| parent | 7cc8cae3a669fc5de91d6bc23812c265e8af4c93 (diff) | |
Merge branch 'release/0.6.9' into wdtk
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 3c94e1b47..a946526b8 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -54,10 +54,15 @@ class ApplicationController < ActionController::Base end def set_gettext_locale + if Configuration::include_default_locale_in_urls == false + params_locale = params[:locale] ? params[:locale] : I18n.default_locale + else + params_locale = params[:locale] + end if Configuration::use_default_browser_language - requested_locale = params[:locale] || session[:locale] || cookies[:locale] || request.env['HTTP_ACCEPT_LANGUAGE'] || I18n.default_locale + 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 + requested_locale = params_locale || session[:locale] || cookies[:locale] || I18n.default_locale end requested_locale = FastGettext.best_locale_in(requested_locale) session[:locale] = FastGettext.set_locale(requested_locale) |