From: Tom Hughes <tom@compton.nu>
Date: Fri, 1 Jul 2011 19:38:41 +0000 (+0100)
Subject: Show the name of the logged in user during OAuth authorization
X-Git-Tag: live~6828
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/67a50468c55f4a805c1eae001a13da10157976e0

Show the name of the logged in user during OAuth authorization
---

diff --git a/app/views/oauth/oauthorize.html.erb b/app/views/oauth/oauthorize.html.erb
index 844a86d52..28178a85c 100644
--- a/app/views/oauth/oauthorize.html.erb
+++ b/app/views/oauth/oauthorize.html.erb
@@ -1,5 +1,5 @@
 <h1>Authorize access to your account</h1>
-<p><%= t('oauth.oauthorize.request_access', :app_name => link_to(@token.client_application.name,@token.client_application.url)) %></p>
+<p><%= t('oauth.oauthorize.request_access', :app_name => link_to(@token.client_application.name, @token.client_application.url), :user => link_to(@user.display_name, :controller => :user, :action => :view, :display_name => @user.display_name)) %></p>
 <% form_tag authorize_url do %>
   <%= hidden_field_tag "oauth_token", @token.token %>
   <%- if params[:oauth_callback] -%>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 31462fe8f..76d481f53 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1451,7 +1451,7 @@ en:
       need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
   oauth:
     oauthorize:
-      request_access: "The application %{app_name} is requesting access to your account. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
+      request_access: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
       allow_to: "Allow the client application to:"
       allow_read_prefs:  "read your user preferences."
       allow_write_prefs: "modify your user preferences."