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

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

diff --git a/app/views/messages/new.html.erb b/app/views/messages/new.html.erb
index dedace3d7657956b49802c45599be8c2ef703316..2aac33efaf7f15cca3f302208030383ad2af0837 100644 (file)
--- a/app/views/messages/new.html.erb
+++ b/app/views/messages/new.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
-  <h2><%= raw(t ".send_message_to", :name => link_to(h(@message.recipient.display_name), user_path(@message.recipient))) %></h2>
+  <h2><%= t(".send_message_to_html", :name => link_to(h(@message.recipient.display_name), user_path(@message.recipient))) %></h2>
 <% end %>
 
 <%= error_messages_for "message" %>
@@ -16,7 +16,7 @@
       <%= richtext_area :message, :body, :cols => 80, :rows => 20 %>
     </div>
     <div class='buttons'>
-      <%= submit_tag t(".send_button") %>
+      <%= f.submit %>
       <%= link_to t(".back_to_inbox"), inbox_messages_path, :class => "deemphasize button" %>
     </div>
   </fieldset>