Merge branch 'master' into tag-colour-preview-rebase

[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 3108c551af65054394244d0cb6d393d7917aea4d..c480b4c99d7cd27fe6896b3f97e63b757b116192 100644 (file)
--- a/app/views/oauth/authorize.html.erb
+++ b/app/views/oauth/authorize.html.erb
@@ -2,17 +2,17 @@
   <h1><%= t ".title" %></h1>
 <% end %>
 
   <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, :controller => :user, :action => :view, :display_name => current_user.display_name)) %></p>
+<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 -%>
 
 <%= 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 '.allow_to' %></p>
+  <p><%= t ".allow_to" %></p>

   <ul>
   <% @token.client_application.permissions.each do |perm| %>
   <ul>
   <% @token.client_application.permissions.each do |perm| %>

-    <li><%= check_box_tag perm.to_s, "yes", @token.read_attribute(perm) %><%= t ".#{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 t(".grant_access") %></p>
   <% end %>
   </ul>
   <p><%= submit_tag t(".grant_access") %></p>