X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6fb857020092c909043c4521b91a040f3bb16937..0030c7753740820fab12455dd841cd39c58b6475:/app/models/notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index a1fde49b3..f025da7b1 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -4,6 +4,7 @@ class Notifier < ActionMailer::Base
     subject I18n.t('notifier.signup_confirm.subject')
     body :url => url_for(:host => SERVER_URL,
                          :controller => "user", :action => "confirm",
+                         :display_name => user.display_name,
                          :confirm_string => token.token)
   end
 
@@ -94,6 +95,22 @@ class Notifier < ActionMailer::Base
     body :friend => friend
   end
 
+  def note_comment_notification(comment, recipient)
+    common_headers recipient
+    owner = (recipient == comment.note.author);
+    subject I18n.t('notifier.note_plain.subject_own', :commenter => comment.author_name) if owner
+    subject I18n.t('notifier.note_plain.subject_other', :commenter => comment.author_name) unless owner
+
+    body :nodeurl => url_for(:host => SERVER_URL,
+                             :controller => "browse",
+                             :action => "note",
+                             :id => comment.note_id),
+         :place => comment.note.nearby_place,
+         :comment => comment.body,
+         :owner => owner,
+         :commenter => comment.author_name
+  end
+
 private
 
   def common_headers(recipient)