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

[rails.git] / app / views / user_blocks / _blocks.html.erb

diff --git a/app/views/user_blocks/_blocks.html.erb b/app/views/user_blocks/_blocks.html.erb
index e9dfc7185dd8d8fa110ac99b6bb4950f4483737d..01e54de21cca256ff8892f14a6d4fc5390619d5e 100644 (file)
--- a/app/views/user_blocks/_blocks.html.erb
+++ b/app/views/user_blocks/_blocks.html.erb
@@ -1,14 +1,14 @@
 <table id="block_list" cellpadding="3">
   <tr>
     <% if show_user_name %>
 <table id="block_list" cellpadding="3">
   <tr>
     <% if show_user_name %>

-    <th><%= t'user_block.partial.display_name' %></th>
+    <th><%= t '.display_name' %></th>

     <% end %>
     <% if show_creator_name %>
     <% end %>
     <% if show_creator_name %>

-    <th><%= t'user_block.partial.creator_name' %></th>
+    <th><%= t '.creator_name' %></th>

     <% end %>
     <% end %>

-    <th><%= t'user_block.partial.reason' %></th>
-    <th><%= t'user_block.partial.status' %></th>
-    <th><%= t'user_block.partial.revoker_name' %></th>
+    <th><%= t '.reason' %></th>
+    <th><%= t '.status' %></th>
+    <th><%= t '.revoker_name' %></th>

     <th></th>
     <th></th>
     <% if show_revoke_link %>
     <th></th>
     <th></th>
     <% if show_revoke_link %>


@@ -20,16 +20,16 @@
 
 <ul class='secondary-actions'>
   <% if @user_blocks_pages.current_page.number > 1 -%>
 
 <ul class='secondary-actions'>
   <% if @user_blocks_pages.current_page.number > 1 -%>

-    <li><%= link_to t('user_block.partial.previous'), @params.merge({ :page => @user_blocks_pages.current_page.number - 1 }) %></li>
+    <li><%= link_to t('.previous'), @params.merge({ :page => @user_blocks_pages.current_page.number - 1 }) %></li>

   <% else -%>
   <% else -%>

-    <li><%= t('user_block.partial.previous') %></li>
+    <li><%= t('.previous') %></li>

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

-  <li><%= t('user_block.partial.showing_page', :page => @user_blocks_pages.current_page.number) %></li>
+  <li><%= t('.showing_page', :page => @user_blocks_pages.current_page.number) %></li>

 
   <% if @user_blocks_pages.current_page.number < @user_blocks_pages.page_count -%>
 
   <% if @user_blocks_pages.current_page.number < @user_blocks_pages.page_count -%>

-    <li><%= link_to t('user_block.partial.next'), @params.merge({ :page => @user_blocks_pages.current_page.number + 1 }) %></li>
+    <li><%= link_to t('.next'), @params.merge({ :page => @user_blocks_pages.current_page.number + 1 }) %></li>

   <% else -%>
   <% else -%>

-    <li><%= t('user_block.partial.next') %></li>
+    <li><%= t('.next') %></li>

   <% end -%>
 </ul>
   <% end -%>
 </ul>