Merge branch 'master' into moderation

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

diff --git a/app/views/notifier/note_comment_notification.text.erb b/app/views/notifier/note_comment_notification.text.erb
index 7b4ccd3841f5a4da607557df81c9e7e19366b16f..5924c8a9d2036975a35ce07db95439b83f351748 100644 (file)
--- a/app/views/notifier/note_comment_notification.text.erb
+++ b/app/views/notifier/note_comment_notification.text.erb
@@ -1,13 +1,15 @@
 <%= t 'notifier.note_comment_notification.greeting' %>
 
 <% if @owner %>
-<%= t 'notifier.note_comment_notification.your_note', :commenter => @commenter, :place => @place %>
+<%= t "notifier.note_comment_notification.#{@event}.your_note", :commenter => @commenter, :place => @place %>
 <% else %>
-<%= t 'notifier.note_comment_notification.commented_note', :commenter => @commenter, :place => @place %>
+<%= t "notifier.note_comment_notification.#{@event}.commented_note", :commenter => @commenter, :place => @place %>
 <% end %>
 
+<% unless @comment.empty? %>
 ==
-<%= @comment %>
+<%= @comment.to_text %>
 ==
 
+<% end %>
 <%= t 'notifier.note_comment_notification.details', :url => @noteurl %>