Merge branch 'master' into openID

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

diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb
index 43b69d13c0de79941e39d6343df3c25f61f22c35..bc405ecce4b6682a67dcae292071f2c815956283 100644 (file)
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -1,7 +1,7 @@
 <% @title = t('user_block.show.title',
               :block_on => @user_block.user.display_name,
               :block_by => @user_block.creator.display_name) %>
 <% @title = t('user_block.show.title',
               :block_on => @user_block.user.display_name,
               :block_by => @user_block.creator.display_name) %>

-<h1><%= t('user_block.show.title',
+<h1><%= t('user_block.show.heading',

           :block_on => link_to(
                                h(@user_block.user.display_name),
                                {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name}),
           :block_on => link_to(
                                h(@user_block.user.display_name),
                                {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name}),


@@ -17,11 +17,8 @@
 
 <p><b><%= t'user_block.show.status' %></b>: <%= block_status(@user_block) %></p>
 
 
 <p><b><%= t'user_block.show.status' %></b>: <%= block_status(@user_block) %></p>
 

-<p>
-  <b><%= t'user_block.show.reason' %></b>
-  <%=h @user_block.reason %>
-</p>
-
+<p><b><%= t'user_block.show.reason' %></b></p>
+<%= htmlize(@user_block.reason) %>

 
 <% if @user_block.ends_at > Time.now.getutc %>
 <% if @user and @user.id == @user_block.creator_id %>
 
 <% if @user_block.ends_at > Time.now.getutc %>
 <% if @user and @user.id == @user_block.creator_id %>