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

[rails.git] / app / views / user_mailer / message_notification.html.erb

diff --git a/app/views/user_mailer/message_notification.html.erb b/app/views/user_mailer/message_notification.html.erb
index fd49c6723c410da3bae56a249eabe3261e8882a5..a39a3fe5d1825b5cef527a10ded387f82e68f76c 100644 (file)
--- a/app/views/user_mailer/message_notification.html.erb
+++ b/app/views/user_mailer/message_notification.html.erb
@@ -2,7 +2,7 @@
   <%= t ".hi", :to_user => @to_user %>
 </p>
 <p>
   <%= t ".hi", :to_user => @to_user %>
 </p>
 <p>

-  <%= t ".header",
+  <%= t ".header_html",

         :from_user => link_to_user(@from_user),
         :subject => tag.em(@title) %>
 </p>
         :from_user => link_to_user(@from_user),
         :subject => tag.em(@title) %>
 </p>


@@ -14,7 +14,7 @@
 <% content_for :footer do %>
   <p>
     <%= t ".footer_html",
 <% content_for :footer do %>
   <p>
     <%= t ".footer_html",

-          :readurl => link_to(@readurl, @readurl) + tag(:br),
+          :readurl => link_to(@readurl, @readurl) + tag.br,

           :replyurl => link_to(@replyurl, @replyurl) %>
   </p>
 <% end %>
           :replyurl => link_to(@replyurl, @replyurl) %>
   </p>
 <% end %>