about summary refs log tree commit diff
path: root/app/controllers/oauth/authorizations_controller.rb
diff options
context:
space:
mode:
authorShel R <Yiskah.Raphen@gmail.com>2017-04-07 22:23:50 -0400
committerGitHub <noreply@github.com>2017-04-07 22:23:50 -0400
commit7632178300705bead8547284729fd50d038741b9 (patch)
tree881b0aef00eb6c558aaaae8cd66e4166bff5b031 /app/controllers/oauth/authorizations_controller.rb
parentd025c5e59306bed05aad4ebc52c541c34cf43d94 (diff)
parente4e948a21b748a30035392b249b3ee705ed86a91 (diff)
Merge branch 'master' into patch-1
Diffstat (limited to 'app/controllers/oauth/authorizations_controller.rb')
-rw-r--r--app/controllers/oauth/authorizations_controller.rb9
1 files changed, 2 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