Merge branch 'master' into openstreetbugs

[rails.git] / app / models / notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index e8c9259cbe2aa7107c08ff7bc803d8cabf86e3b3..f025da7b19c6ddda686a687b0e30a5cf2d085f97 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -95,20 +95,20 @@ class Notifier < ActionMailer::Base
     body :friend => friend
   end
 
     body :friend => friend
   end
 

-  def bug_comment_notification(bug_comment, recipient)
+  def note_comment_notification(comment, recipient)

     common_headers recipient
     common_headers recipient

-    owner = (recipient == bug_comment.map_bug.author);
-    subject I18n.t('notifier.map_bug_plain.subject_own', :commenter => bug_comment.author_name) if owner
-    subject I18n.t('notifier.map_bug_plain.subject_other', :commenter => bug_comment.author_name) unless owner
+    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 :bugurl => url_for(:host => SERVER_URL,
-                            :controller => "browse",
-                            :action => "bug",
-                            :id => bug_comment.bug_id),
-         :place => bug_comment.map_bug.nearby_place,
-         :comment => bug_comment.body,
+    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,
          :owner => owner,

-         :commenter => bug_comment.author_name
+         :commenter => comment.author_name

   end
 
 private
   end
 
 private