diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:54:25 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:54:25 -0400 |
commit | 971c4de18c35bcfe24e92d40b657950b19dfa62a (patch) | |
tree | 90118f965cd5770911e1daa8cc684746ece1e321 /app/controllers/oauth | |
parent | 4b08b7c50274bbfdd527a17eddd1242d21fc8cae (diff) | |
parent | 394c8ef6801a82fab0bb3b75fbef1e6b6100d28a (diff) |
Merge branch 'master' into patch-1
Diffstat (limited to 'app/controllers/oauth')
-rw-r--r-- | app/controllers/oauth/authorizations_controller.rb | 9 | ||||
-rw-r--r-- | app/controllers/oauth/authorized_applications_controller.rb | 16 |
2 files changed, 18 insertions, 7 deletions
diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb index 7c25266d8..cdbfde0fb 100644 --- a/app/controllers/oauth/authorizations_controller.rb +++ b/app/controllers/oauth/authorizations_controller.rb @@ -1,9 +1,10 @@ # frozen_string_literal: true class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController + include Localized + skip_before_action :authenticate_resource_owner! - before_action :set_locale before_action :store_current_location before_action :authenticate_resource_owner! @@ -12,10 +13,4 @@ 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 diff --git a/app/controllers/oauth/authorized_applications_controller.rb b/app/controllers/oauth/authorized_applications_controller.rb new file mode 100644 index 000000000..09dd5d3c4 --- /dev/null +++ b/app/controllers/oauth/authorized_applications_controller.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicationsController + include Localized + + skip_before_action :authenticate_resource_owner! + + before_action :store_current_location + before_action :authenticate_resource_owner! + + private + + def store_current_location + store_location_for(:user, request.url) + end +end |