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

[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 3973355317d03f04d24481c7ad58d000d6358344..7d1f83ce357e533edee42e529b6c27d8c172d0b6 100644 (file)
--- a/app/views/user_blocks/blocks_on.html.erb
+++ b/app/views/user_blocks/blocks_on.html.erb
@@ -1,9 +1,10 @@
-<% @title = t('user_block.blocks_on.title', :name => h(@this_user.display_name)) %>
+<% @title = t(".title", :name => @user.display_name) %>
 <% content_for :heading do %>
-  <h1><%= raw(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>
+  <h1><%= t(".heading_html", :name => link_to(@user.display_name, user_path(@user))) %></h1>
 <% end %>
+
 <% unless @user_blocks.empty? %>
-<%= render :partial => 'blocks', :locals => { :show_revoke_link => (current_user and current_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 %>
-<p><%= t "user_block.blocks_on.empty", :name => h(@this_user.display_name) %></p>
+<p><%= t ".empty", :name => @user.display_name %></p>
 <% end %>