Merge remote-tracking branch 'upstream/pull/1974'

[rails.git] / app / views / oauth / authorize.html.erb

diff --git a/app/views/oauth/authorize.html.erb b/app/views/oauth/authorize.html.erb
index 987997de2258598cadd5314c822a1b61881d132f..d53181c172ef2776e269e5a53ddc1a3d58ce8e8e 100644 (file)
--- a/app/views/oauth/authorize.html.erb
+++ b/app/views/oauth/authorize.html.erb
@@ -1,14 +1,19 @@
-<h1>Authorize access to your account</h1>
-<p>Would you like to authorize <%= link_to @token.client_application.name,@token.client_application.url %> (<%= link_to @token.client_application.url,@token.client_application.url %>) to access your account?</p>
-<% form_tag authorize_url do %>
+<% content_for :heading do %>
+  <h1><%= t ".title" %></h1>
+<% end %>
+
+<p><%= raw t(".request_access", :app_name => link_to(@token.client_application.name, @token.client_application.url), :user => link_to(current_user.display_name, user_path(current_user))) %></p>
+
+<%= form_tag authorize_url do %>
   <%= hidden_field_tag "oauth_token", @token.token %>
   <%- if params[:oauth_callback] -%>
-  <%= hidden_field_tag "oauth_callback", params[:oauth_callback] %>
-<%- end -%>
-<p>
-       <%= check_box_tag 'authorize' %> authorize access
-</p>
-<p>
-       <%= submit_tag %>
-</p>
-<% end %>
\ No newline at end of file
+    <%= hidden_field_tag "oauth_callback", params[:oauth_callback] %>
+  <%- end -%>
+  <p><%= t '.allow_to' %></p>
+  <ul>
+  <% @token.client_application.permissions.each do |perm| %>
+    <li><%= check_box_tag perm.to_s, "yes", @token.read_attribute(perm) %><%= label_tag perm.to_s, t(".#{perm}") %></li>
+  <% end %>
+  </ul>
+  <p><%= submit_tag t(".grant_access") %></p>
+<% end %>