X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0d3a9ed9cb47ce3b89ea9eaffbb589f9a9ff6d22..ef7f3d800cbdd49b692df10d312e5fd880e2e938:/app/controllers/oauth_controller.rb diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb index 856fdd790..4f094b981 100644 --- a/app/controllers/oauth_controller.rb +++ b/app/controllers/oauth_controller.rb @@ -3,7 +3,7 @@ require 'oauth/controllers/provider_controller' class OauthController < ApplicationController include OAuth::Controllers::ProviderController - layout 'slim' + layout 'site' def login_required authorize_web @@ -35,11 +35,11 @@ class OauthController < ApplicationController redirect_to oauth_clients_url(:display_name => @token.user.display_name) end -protected + protected def oauth1_authorize unless @token - render :action=>"authorize_failure" + render :action => "authorize_failure" return end @@ -67,10 +67,12 @@ protected end else @token.invalidate! + @message = t("oauth.oauthorize_failure.denied", :app_name => @token.client_application.name) render :action => "authorize_failure" end end else + @message = t "oauth.oauthorize_failure.invalid" render :action => "authorize_failure" end end