-<% @title = t('user_block.blocks_by.title', :name => h(@this_user.display_name)) %>
-<h1><%= raw(t('user_block.blocks_by.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_path(@user))) %></h1>
+<% end %>