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

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

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

-  <%= raw t ".header", :from_user => link_to_user(@from_user), :subject => tag.em(@title) %>
+  <%= t ".header_html", :from_user => link_to_user(@from_user), :subject => tag.em(@title) %>

 </p>
 
 <%= message_body do %>
 </p>
 
 <%= message_body do %>


@@ -10,9 +10,12 @@
 <% end %>
 
 <% content_for :footer do %>
 <% end %>
 
 <% content_for :footer do %>

-  <p><%= raw t ".footer",
-               :readurl => link_to(@readurl, @readurl) + tag(:br),
-               :commenturl => link_to(@commenturl, @commenturl) + tag(:br),
-               :replyurl => link_to(@replyurl, @replyurl) %>
+  <p><%= t ".footer_html",
+           :readurl => link_to(@readurl, @readurl) + tag.br,
+           :commenturl => link_to(@commenturl, @commenturl) + tag.br,
+           :replyurl => link_to(@replyurl, @replyurl) %>
+  </p>
+  <p><%= t ".footer_unsubscribe_html",
+           :unsubscribeurl => link_to(@unsubscribeurl, @unsubscribeurl) %>

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