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

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

diff --git a/app/views/user_blocks/new.html.erb b/app/views/user_blocks/new.html.erb
index aa4bf7132107f85253ca7ba5b027175caab2a4a2..18b03eda9f0c9ca908b9de35fb47bc0fec00aa34 100644 (file)
--- a/app/views/user_blocks/new.html.erb
+++ b/app/views/user_blocks/new.html.erb
@@ -1,8 +1,8 @@
 <% @title = t ".title", :name => h(@user.display_name) %>
 <% content_for :heading do %>
 <% @title = t ".title", :name => h(@user.display_name) %>
 <% content_for :heading do %>

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

 <% end %>
 <%= form_for(@user_block) do |f| %>
   <%= f.error_messages %>
 <% end %>
 <%= form_for(@user_block) do |f| %>
   <%= f.error_messages %>


@@ -21,7 +21,7 @@
   </p>
   <p>
     <%= hidden_field_tag "display_name", @user.display_name %>
   </p>
   <p>
     <%= hidden_field_tag "display_name", @user.display_name %>

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

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