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

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

diff --git a/app/views/notifier/note_comment_notification.html.erb b/app/views/notifier/note_comment_notification.html.erb
index ab4378fa275f00067570c4a235a7002f90ee683f..3a828602865d17ad0bb8ce3aab0c4e085e3d3df1 100644 (file)
--- a/app/views/notifier/note_comment_notification.html.erb
+++ b/app/views/notifier/note_comment_notification.html.erb
@@ -1,15 +1,15 @@
-<% content_for :body do %>
-  <p style="margin: 0"><%= t 'notifier.note_comment_notification.greeting' %></p>
+<p><%= t ".greeting" %></p>
 
-  <% if @owner %>
-    <p><%= raw t "notifier.note_comment_notification.#{@event}.your_note", :commenter => link_to_user(@commenter), :place => @place %></p>
-  <% else %>
-    <p><%= raw t "notifier.note_comment_notification.#{@event}.commented_note", :commenter => link_to_user(@commenter), :place => @place %></p>
-  <% end %>
+<% if @owner %>
+  <p><%= raw t ".#{@event}.your_note", :commenter => link_to_user(@commenter), :place => @place %></p>
+<% else %>
+  <p><%= raw t ".#{@event}.commented_note", :commenter => link_to_user(@commenter), :place => @place %></p>
+<% end %>
 
-  <%= render "notifier/user_message_table", :captured => capture { %>
+<% unless @comment.empty? %>
+  <%= message_body do %>
     <%= @comment.to_html %>
-  <% } %>
-
-  <p><%= raw t 'notifier.note_comment_notification.details', :url => link_to(@noteurl, @noteurl) %></p>
+  <% end %>
 <% end %>
+
+<p><%= raw t ".details", :url => link_to(@noteurl, @noteurl) %></p>