Author: Hugo Melo <hugo@riseup.net>
Make locales work again
app/controllers/application_controller.rb | 2 +-
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 372ca4be45a3e17b868c696b59fe90f5396d7acb..e76ddb74a4a1cf0e15eb6ca38239915b046744a0 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -110,7 +110,7 @@ before_filter :set_locale def set_locale FastGettext.available_locales = environment.available_locales FastGettext.default_locale = environment.default_locale || :en_US - FastGettext.locale = ENV['LANG'] || params[:lang] || session[:lang] || environment.default_locale || request.env['HTTP_ACCEPT_LANGUAGE'] || :en_US + FastGettext.locale = params[:lang] || session[:lang] || ENV['LANG'] || environment.default_locale || request.env['HTTP_ACCEPT_LANGUAGE'] || :en_US I18n.locale = FastGettext.locale I18n.default_locale = FastGettext.default_locale if params[:lang]