diff options
| author | André Lewin <andre.charles.lewin@gmail.com> | 2017-04-05 20:28:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-05 20:28:58 +0200 |
| commit | bf7cefa516075b480fd5da5ea4b1385d7d17bdd5 (patch) | |
| tree | 45bc6b379f5d06553d0a3e5bf4c0e2b452b7552f /app/controllers/oauth | |
| parent | 8736ef50ad13d5506bd6a673d4fcb96c33b609a3 (diff) | |
| parent | d13d169922c7efeb6e6c20ef6a271eeda552275f (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'app/controllers/oauth')
| -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 |