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

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

diff --git a/app/views/notifier/diary_comment_notification.html.erb b/app/views/notifier/diary_comment_notification.html.erb
index b47900a631fc2ef28e90ffe2fe87564beead0c18..201c14cb0b5ff59c69d8a963696f197be822cd18 100644 (file)
--- a/app/views/notifier/diary_comment_notification.html.erb
+++ b/app/views/notifier/diary_comment_notification.html.erb
@@ -1,9 +1,18 @@
-<p><%= t'notifier.diary_comment_notification.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 => content_tag("em", @title) %>
+</p>
 
-<p><%= raw t'notifier.diary_comment_notification.header', :from_user => link_to(@from_user, :host => SERVER_URL, :controller => :user, :action => :view, :display_name => @from_user), :subject => @title %></p>
+<%= message_body do %>
+  <%= @text.to_html %>
+<% end %>
 
-==
-<%= @text.to_html %>
-==
-
-<p><%= raw t'notifier.diary_comment_notification.footer', :readurl => link_to(@readurl, @readurl), :commenturl => link_to(@commenturl, @commenturl), :replyurl => link_to(@replyurl, @replyurl) %></p>
+<% 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>
+<% end %>