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

[rails.git] / app / views / oauth_clients / index.html.erb

diff --git a/app/views/oauth_clients/index.html.erb b/app/views/oauth_clients/index.html.erb
index d95c68bcb09d9a41552109fbaf252546b4eef9a0..64a316718a9f709239c360779cd5ef4f40be3918 100644 (file)
--- a/app/views/oauth_clients/index.html.erb
+++ b/app/views/oauth_clients/index.html.erb
@@ -1,33 +1,36 @@
-<h1><%= t'oauth_clients.index.title' %></h1>
+<% content_for :heading do %>
+  <h1><%= t '.title' %></h1>
+<% end %>
+

 <% unless @tokens.empty? %>
 <% unless @tokens.empty? %>

-<h3><%= t'oauth_clients.index.my_tokens' %></h3>
-<p><%= t'oauth_clients.index.list_tokens' %></p>
+<h3><%= t '.my_tokens' %></h3>
+<p><%= t '.list_tokens' %></p>

 <table>
 <table>

-  <tr><th><%= t'oauth_clients.index.application' %></th>
-    <th><%= t'oauth_clients.index.issued_at' %></th><th>&nbsp;</th></tr>
+  <tr><th><%= t '.application' %></th>
+    <th><%= t '.issued_at' %></th><th>&nbsp;</th></tr>

   <% @tokens.each do |token|%>
   <% @tokens.each do |token|%>

-    <% content_tag_for :tr, token do %>
+    <%= content_tag_for :tr, token do %>

       <td><%= link_to token.client_application.name, token.client_application.url %></td>
       <td><%= token.authorized_at %></td>
       <td>
       <td><%= link_to token.client_application.name, token.client_application.url %></td>
       <td><%= token.authorized_at %></td>
       <td>

-       <% form_tag :controller => 'oauth', :action => 'revoke' do %>
+       <%= form_tag :controller => 'oauth', :action => 'revoke' do %>

        <%= hidden_field_tag 'token', token.token %>
        <%= hidden_field_tag 'token', token.token %>

-       <%= submit_tag t('oauth_clients.index.revoke') %>
+       <%= submit_tag t('.revoke') %>

        <% end %>
       </td>
     <% end %>
        <% end %>
       </td>
     <% end %>

-  <% end %>    
+  <% end %>

 </table>
 <% end %>
 </table>
 <% end %>

-<h3><%= t'oauth_clients.index.my_apps' %></h3>
+<h3><%= t '.my_apps' %></h3>

 <% if @client_applications.empty? %>
 <% if @client_applications.empty? %>

-<p><%= t('oauth_clients.index.no_apps', :oauth => "<a href=\"http://oauth.net\">OAuth</a>") %></p>
+<p><%= raw(t('.no_apps', :oauth => "<a href=\"https://oauth.net\">OAuth</a>")) %></p>

 <% else %>
 <% else %>

-<p><%= t'oauth_clients.index.registered_apps' %></p>
+<p><%= t '.registered_apps' %></p>

 <% @client_applications.each do |client|%>
 <% @client_applications.each do |client|%>

-  <% div_for client do %>
+  <%= div_for client do %>

     <%= link_to client.name, :action => :show, :id => client.id %>
   <% end %>
 <% end %>
 <% end %>
     <%= link_to client.name, :action => :show, :id => client.id %>
   <% end %>
 <% end %>
 <% end %>

-<h3><%= link_to t('oauth_clients.index.register_new'), :action => :new %></h3>
+<h3><%= link_to t('.register_new'), :action => :new %></h3>