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

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

diff --git a/app/views/user_blocks/index.html.erb b/app/views/user_blocks/index.html.erb
index 2baf91e5f25559e7975e281333d35c3b98805a96..57cef6055992722523a71dc475feb718b6c1423a 100644 (file)
--- a/app/views/user_blocks/index.html.erb
+++ b/app/views/user_blocks/index.html.erb
@@ -1,8 +1,10 @@
-<% @title = t('user_block.index.title') %>
-<h1><%= t('user_block.index.heading') %></h1>
+<% @title = t(".title") %>
+<% content_for :heading do %>
+  <h1><%= t(".heading") %></h1>
+<% end %>

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

-<%= render :partial => 'blocks', :locals => { :show_revoke_link => (@user and @user.moderator?), :show_user_name => true, :show_creator_name => true } %>
+<%= render :partial => "blocks", :locals => { :show_revoke_link => can?(:revoke, UserBlock), :show_user_name => true, :show_creator_name => true } %>

 <% else %>
 <% else %>

-<p><%= t "user_block.index.empty" %></p>
+<p><%= t ".empty" %></p>

 <% end %>
 <% end %>