Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1716 from ok-harry/master 

set_locale of application_controller.rb must be called earlier
This commit is contained in:
Robin Ward 2013-12-04 07:09:14 -08:00
parent 28bfb34488 2d9876a6ac
commit df7b24b14a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@ -25,6 +25,7 @@ class ApplicationController < ActionController::Base
end end
end end
before_filter :set_locale
before_filter :set_mobile_view before_filter :set_mobile_view
before_filter :inject_preview_style before_filter :inject_preview_style
before_filter :disable_customization before_filter :disable_customization
@ -33,7 +34,6 @@ class ApplicationController < ActionController::Base
before_filter :store_incoming_links before_filter :store_incoming_links
before_filter :preload_json before_filter :preload_json
before_filter :check_xhr before_filter :check_xhr
before_filter :set_locale
before_filter :redirect_to_login_if_required before_filter :redirect_to_login_if_required
rescue_from Exception do |exception| rescue_from Exception do |exception|