mirror of
https://github.com/discourse/discourse.git
synced 2026-08-26 21:27:16 -05:00
Merge pull request #1716 from ok-harry/master
set_locale of application_controller.rb must be called earlier
This commit is contained in:
@@ -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|
|
||||||
|
|||||||
Reference in New Issue
Block a user