diff options
author | Eugen <eugen@zeonfederated.com> | 2017-04-04 14:51:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-04 14:51:42 +0200 |
commit | 48dfdad49255ae4a100e01f41852e65806858fce (patch) | |
tree | a2bfe7a94bcd7a37399470b31c0453e1b489dea9 /app/controllers/oauth/authorizations_controller.rb | |
parent | 5b6f4fdeb4932df1704da01762cc22c63aacb20f (diff) | |
parent | ed4a723a82e90fc057494e4fdec4a2074a3164c7 (diff) |
Merge branch 'master' into patch-1
Diffstat (limited to 'app/controllers/oauth/authorizations_controller.rb')
-rw-r--r-- | app/controllers/oauth/authorizations_controller.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb index feaad04f6..7c25266d8 100644 --- a/app/controllers/oauth/authorizations_controller.rb +++ b/app/controllers/oauth/authorizations_controller.rb @@ -3,6 +3,7 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController skip_before_action :authenticate_resource_owner! + before_action :set_locale before_action :store_current_location before_action :authenticate_resource_owner! @@ -11,4 +12,10 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController def store_current_location store_location_for(:user, request.url) end + + def set_locale + I18n.locale = current_user.try(:locale) || I18n.default_locale + rescue I18n::InvalidLocale + I18n.locale = I18n.default_locale + end end |