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

[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 eaf43f9d122073aac87d3271146054c5807935e9..5fd3c2feec02f681f81187719c1c32ae593af33d 100644 (file)
--- a/app/views/oauth/authorize.html.erb
+++ b/app/views/oauth/authorize.html.erb
@@ -1,15 +1,19 @@
-<h1>Authorize access to your account</h1>
-<p><%= raw 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>
+<% content_for :heading do %>
+  <h1><%= t ".title" %></h1>
+<% end %>
+
+<p><%= t(".request_access_html", :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><%= t 'oauth.oauthorize.allow_to' %></p>
-  <ul style="list-style:none">
+  <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) %><%= t "oauth.oauthorize.#{perm}" %></li>
+    <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 %></p>
+  <p><%= submit_tag t(".grant_access") %></p>
 <% end %>