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

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

diff --git a/app/views/user_blocks/_block.html.erb b/app/views/user_blocks/_block.html.erb
index d91168f54109c63565e6d4b01d5e8de684124828..b8a753e0412bde9d7da9ae392e812fd0dea3f3fc 100644 (file)
--- a/app/views/user_blocks/_block.html.erb
+++ b/app/views/user_blocks/_block.html.erb
@@ -11,14 +11,14 @@
   <td class="<%= c1 %>"><%=h block_status(block) %></td>
   <td class="<%= c1 %>">
     <% if block.revoker_id.nil? %>
   <td class="<%= c1 %>"><%=h block_status(block) %></td>
   <td class="<%= c1 %>">
     <% if block.revoker_id.nil? %>

-      <%= t('user_block.partial.not_revoked') %>
+      <%= t('.not_revoked') %>

     <% else %>
       <%= link_to h(block.revoker.display_name), user_path(block.revoker) %>
     <% end %>
   </td>
     <% else %>
       <%= link_to h(block.revoker.display_name), user_path(block.revoker) %>
     <% end %>
   </td>

-  <td class="<%= c1 %>"><%= link_to t('user_block.partial.show'), block %></td>
-  <td class="<%= c1 %>"><% if current_user and current_user.id == block.creator_id and block.active? %><%= link_to t('user_block.partial.edit'), edit_user_block_path(block) %><% end %></td>
+  <td class="<%= c1 %>"><%= link_to t('.show'), block %></td>
+  <td class="<%= c1 %>"><% if current_user and current_user.id == block.creator_id and block.active? %><%= link_to t('.edit'), edit_user_block_path(block) %><% end %></td>

   <% if show_revoke_link %>
   <% if show_revoke_link %>

-  <td class="<%= c1 %>"><% if block.active? %><%= link_to t('user_block.partial.revoke'), :controller => 'user_blocks', :action => 'revoke', :id => block.id %><% end %></td>
+  <td class="<%= c1 %>"><% if block.active? %><%= link_to t('.revoke'), :controller => 'user_blocks', :action => 'revoke', :id => block.id %><% end %></td>

   <% end %>
 </tr>
   <% end %>
 </tr>