diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-07 13:08:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 13:08:27 +0200 |
| commit | 10459241a89b1ebf57986ee3bb81361475d19212 (patch) | |
| tree | 1404ccf4bffcf332bf46ddcb58650afc9d3eea40 /app/controllers/oauth/authorizations_controller.rb | |
| parent | 786e6f94b986dbf98eae9d79bc75e147fcefc8ec (diff) | |
| parent | 0adee18d73daef653379d7635c8bc972c563bcd4 (diff) | |
Merge pull request #1145 from tootsuite/feature-customized-default-locale
Allow setting of default language through config
Diffstat (limited to 'app/controllers/oauth/authorizations_controller.rb')
| -rw-r--r-- | app/controllers/oauth/authorizations_controller.rb | 9 |
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 |