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

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

diff --git a/app/views/user_mailer/note_comment_notification.html.erb b/app/views/user_mailer/note_comment_notification.html.erb
index 3a828602865d17ad0bb8ce3aab0c4e085e3d3df1..8d779bc48564b2aa6b4c166f446aa07b6a1be660 100644 (file)
--- a/app/views/user_mailer/note_comment_notification.html.erb
+++ b/app/views/user_mailer/note_comment_notification.html.erb
@@ -1,9 +1,9 @@
 <p><%= t ".greeting" %></p>
 
 <% if @owner %>
 <p><%= t ".greeting" %></p>
 
 <% if @owner %>

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

 <% else %>
 <% else %>

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

 <% end %>
 
 <% unless @comment.empty? %>
 <% end %>
 
 <% unless @comment.empty? %>


@@ -12,4 +12,4 @@
   <% end %>
 <% end %>
 
   <% end %>
 <% end %>
 

-<p><%= raw t ".details", :url => link_to(@noteurl, @noteurl) %></p>
+<p><%= t ".details_html", :url => link_to(@noteurl, @noteurl) %></p>