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

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

diff --git a/app/views/user_blocks/blocks_on.html.erb b/app/views/user_blocks/blocks_on.html.erb
index 2074af433defaf027844eab07c92cf80b9dacd31..ed03342dc73deed0014fc4516dd0df4baf28721f 100644 (file)
--- a/app/views/user_blocks/blocks_on.html.erb
+++ b/app/views/user_blocks/blocks_on.html.erb
@@ -1,8 +1,10 @@
-<% @title = t('user_block.blocks_on.title', :name => h(@this_user.display_name)) %>
-<h1><%= t('user_block.blocks_on.heading', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name})) %></h1>
+<% @title = t(".title", :name => @user.display_name) %>
+<% content_for :heading do %>
+  <h1><%= t(".heading_html", :name => link_to(@user.display_name, @user)) %></h1>
+<% end %>

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

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

 <% else %>
 <% else %>

-<p><%= t "user_block.blocks_on.empty", :name => h(@this_user.display_name) %></p>
+<p><%= t ".empty", :name => @user.display_name %></p>

 <% end %>
 <% end %>