Merge branch 'master' into openstreetbugs

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

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 6ba90ce58954b0096cc621ba260bb80e0f86a4ce..f025da7b19c6ddda686a687b0e30a5cf2d085f97 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",
     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
 
                          :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
   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,
     body :to_user => message.recipient.display_name,
          :from_user => message.sender.display_name,
          :body => message.body,


@@ -84,20 +85,30 @@ class Notifier < ActionMailer::Base
          :replyurl => url_for(:host => SERVER_URL,
                               :controller => "message",
                               :action => "new",
          :replyurl => url_for(:host => SERVER_URL,
                               :controller => "message",
                               :action => "new",

-                              :user_id => comment.user.id,
+                              :display_name => comment.user.display_name,

                               :title => "Re: #{comment.diary_entry.title}")
   end
 
   def friend_notification(friend)
                               :title => "Re: #{comment.diary_entry.title}")
   end
 
   def friend_notification(friend)

-    befriender = User.find_by_id(friend.user_id)
-    befriendee = User.find_by_id(friend.friend_user_id)
+    common_headers friend.befriendee
+    subject I18n.t('notifier.friend_notification.subject', :user => friend.befriender.display_name, :locale => locale)
+    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

 
 

-    common_headers befriendee
-    subject I18n.t('notifier.friend_notification.subject', :user => befriender.display_name, :locale => locale)
-    body :user => befriender.display_name,
-         :userurl => url_for(:host => SERVER_URL,
-                             :controller => "user", :action => "view",
-                             :display_name => befriender.display_name)
+    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
   end
 
 private


@@ -105,14 +116,14 @@ private
   def common_headers(recipient)
     recipients recipient.email
     locale recipient.preferred_language_from(I18n.available_locales)
   def common_headers(recipient)
     recipients recipient.email
     locale recipient.preferred_language_from(I18n.available_locales)

-    from "OpenStreetMap <webmaster@openstreetmap.org>"
-    headers "return-path" => "bounces@openstreetmap.org",
+    from EMAIL_FROM
+    headers "return-path" => EMAIL_RETURN_PATH,

             "Auto-Submitted" => "auto-generated"
   end
 
   def from_header(name, type, id, digest)
             "Auto-Submitted" => "auto-generated"
   end
 
   def from_header(name, type, id, digest)

-    if domain = APP_CONFIG['messages_domain']
-      from "#{name} <#{type}-#{id}-#{digest[0,6]}@#{domain}>"
+    if domain = MESSAGES_DOMAIN
+      from quote_address_if_necessary("#{name} <#{type}-#{id}-#{digest[0,6]}@#{domain}>", "utf-8")

     end
   end
 end
     end
   end
 end