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

[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 d8feeed26d23ad12718584c16110bc294ca49dbc..c0271350d3f2d0bfd512cb64e7a250d95cf7f14f 100644 (file)
--- a/app/views/oauth/authorize.html.erb
+++ b/app/views/oauth/authorize.html.erb
@@ -10,10 +10,10 @@
     <%= hidden_field_tag "oauth_callback", params[:oauth_callback] %>
   <%- end -%>
   <p><%= t 'oauth.oauthorize.allow_to' %></p>
     <%= hidden_field_tag "oauth_callback", params[:oauth_callback] %>
   <%- end -%>
   <p><%= t 'oauth.oauthorize.allow_to' %></p>

-  <ul style="list-style:none">
+  <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>
   <% end %>
   </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>
   <% end %>
   </ul>

-  <p><%= submit_tag %></p>
+  <p><%= submit_tag t("oauth.oauthorize.grant_access") %></p>

 <% end %>
 <% end %>