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

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

diff --git a/app/views/user_blocks/edit.html.erb b/app/views/user_blocks/edit.html.erb
index 6f0ea991bc49a41e7893a42e373cf153993939e0..7b2471eab4b189011069072e5e5a8f2026339fac 100644 (file)
--- a/app/views/user_blocks/edit.html.erb
+++ b/app/views/user_blocks/edit.html.erb
@@ -1,8 +1,8 @@
-<% @title = t ".title", :name => h(@user_block.user.display_name) %>
+<% @title = t ".title", :name => @user_block.user.display_name %>

 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= raw t(".title",
-                :name => link_to(h(@user_block.user.display_name),
-                                 user_path(@user_block.user))) %></h1>
+  <h1><%= t(".heading_html",
+            :name => link_to(@user_block.user.display_name,
+                             user_path(@user_block.user))) %></h1>

   <ul class='secondary-actions clearfix'>
     <li><%= link_to t(".show"), @user_block %></li>
     <li><%= link_to t(".back"), user_blocks_path %></li>
   <ul class='secondary-actions clearfix'>
     <li><%= link_to t(".show"), @user_block %></li>
     <li><%= link_to t(".back"), user_blocks_path %></li>


@@ -13,7 +13,7 @@
   <%= f.error_messages %>
 
   <p>
   <%= f.error_messages %>
 
   <p>

-    <%= f.label :reason, t(".reason", :name => h(@user_block.user.display_name)) %><br />
+    <%= f.label :reason, t(".reason", :name => @user_block.user.display_name) %><br />

     <%= richtext_area :user_block, :reason, :cols => 80, :rows => 20, :format => @user_block.reason_format %>
   </p>
   <p>
     <%= richtext_area :user_block, :reason, :cols => 80, :rows => 20, :format => @user_block.reason_format %>
   </p>
   <p>


@@ -25,6 +25,6 @@
     <%= f.label :needs_view, t(".needs_view") %>
   </p>
   <p>
     <%= f.label :needs_view, t(".needs_view") %>
   </p>
   <p>

-    <%= f.submit t(".submit") %>
+    <%= f.submit %>

   </p>
 <% end %>
   </p>
 <% end %>