Rename association between map_bugs and map_bug_comment to comments

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

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 41734bb5b21e1954d35d6052b41905df225c0768..26c236b7ad48f5550cae088a6644bc4a5b5d8093 100644 (file)
--- 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
 
@@ -48,7 +49,7 @@ class Notifier < ActionMailer::Base
   def message_notification(message)
     common_headers message.recipient
     from_header message.sender.display_name, "m", message.id, message.digest
-    subject I18n.t('notifier.message_notification.subject', :user => message.sender.display_name, :locale => locale)
+    subject I18n.t('notifier.message_notification.subject_header', :subject => message.title, :locale => locale)
     body :to_user => message.recipient.display_name,
          :from_user => message.sender.display_name,
          :body => message.body,
@@ -94,6 +95,22 @@ class Notifier < ActionMailer::Base
     body :friend => friend
   end
 
+  def bug_comment_notification(bug_comment, recipient)
+    common_headers recipient
+    owner = (recipient == bug_comment.map_bug.comments.first.user);
+    subject I18n.t('notifier.map_bug_plain.subject_own', :commenter => bug_comment.commenter_name) if owner
+    subject I18n.t('notifier.map_bug_plain.subject_other', :commenter => bug_comment.commenter_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.comment,
+         :owner => owner,
+         :commenter => bug_comment.commenter_name
+  end
+
 private
 
   def common_headers(recipient)
@@ -105,7 +122,7 @@ private
   end
 
   def from_header(name, type, id, digest)
-    if domain = APP_CONFIG['messages_domain']
+    if domain = MESSAGES_DOMAIN
       from quote_address_if_necessary("#{name} <#{type}-#{id}-#{digest[0,6]}@#{domain}>", "utf-8")
     end
   end