X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ce4a6eefa7405a3d23f722c987f0e22b966defc8..c6be5f3a6f5773455b1f289caefdbe414dbdf7ad:/app/models/notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 1223d54b1..5ec401d18 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -81,7 +81,7 @@ class Notifier < ActionMailer::Base
     @locale = comment.diary_entry.user.preferred_language_from(I18n.available_locales)
     @to_user = comment.diary_entry.user.display_name
     @from_user = comment.user.display_name
-    @body = comment.body
+    @text = comment.body
     @title = comment.diary_entry.title
     @readurl = url_for(:host => SERVER_URL,
                        :controller => "diary_entry",
@@ -114,6 +114,20 @@ class Notifier < ActionMailer::Base
          :subject => I18n.t('notifier.friend_notification.subject', :user => friend.befriender.display_name, :locale => @locale)
   end
 
+  def note_comment_notification(comment, recipient)
+    @locale = recipient.preferred_language_from(I18n.available_locales)
+    @noteurl = browse_note_url(comment.note, :host => SERVER_URL)
+    @place = comment.note.nearby_place
+    @comment = RichText::Text.new(comment.body)
+    @owner = recipient == comment.note.author
+    @commenter = comment.author_name
+
+    subject = I18n.t('notifier.note_comment_notification.subject_own', :commenter => comment.author_name) if @owner
+    subject = I18n.t('notifier.note_comment_notification.subject_other', :commenter => comment.author_name) unless @owner
+
+    mail :to => recipient.email, :subject => subject
+  end
+
 private
 
   def from_address(name, type, id, digest)