Merge remote-tracking branch 'openstreetmap/pull/1401'

[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 fade148d847f57e5fb0be006ff15fd3f5acfd06b..ecaff81dc54c193be45c922cb832e10209035049 100644 (file)
--- a/app/views/notifier/note_comment_notification.html.erb
+++ b/app/views/notifier/note_comment_notification.html.erb
@@ -1,15 +1,13 @@
-<%= t 'notifier.note_plain.greeting' %>
+<p><%= t 'notifier.note_comment_notification.greeting' %></p>

 
 <% if @owner %>
 
 <% if @owner %>

-<%= t 'notifier.note_plain.your_note', :commenter => @commenter, :place => @place %>
+  <p><%= raw t "notifier.note_comment_notification.#{@event}.your_note", :commenter => link_to_user(@commenter), :place => @place %></p>

 <% else %>
 <% else %>

-<%= t 'notifier.note_plain.commented_note', :commenter => @commenter, :place => @place %>
+  <p><%= raw t "notifier.note_comment_notification.#{@event}.commented_note", :commenter => link_to_user(@commenter), :place => @place %></p>

 <% end %>
 
 <% end %>
 

-==
-<%= @comment %>
-==
-
-<%= t 'notifier.note_plain.details', :URL => @noteurl %>
-
+<%= message_body do %>
+  <%= @comment.to_html %>
+<% end %>

 
 

+<p><%= raw t 'notifier.note_comment_notification.details', :url => link_to(@noteurl, @noteurl) %></p>