- common_headers message.recipient
- subject "[OpenStreetMap] #{message.sender.display_name} sent you a new message"
- body :to_user => message.recipient.display_name,
- :from_user => message.sender.display_name,
- :body => message.body,
- :subject => message.title,
- :readurl => url_for(:host => SERVER_URL,
- :controller => "message", :action => "read",
- :message_id => message.id),
- :replyurl => url_for(:host => SERVER_URL,
- :controller => "message", :action => "reply",
- :message_id => message.id)
- end
-
- def diary_comment_notification(comment)
- common_headers comment.diary_entry.user
- subject "[OpenStreetMap] #{comment.user.display_name} commented on your diary entry"
- body :to_user => comment.diary_entry.user.display_name,
- :from_user => comment.user.display_name,
- :body => comment.body,
- :subject => comment.diary_entry.title,
- :readurl => url_for(:host => SERVER_URL,
- :controller => "diary_entry",
- :action => "view",
- :display_name => comment.diary_entry.user.display_name,
- :id => comment.diary_entry.id,
- :anchor => "comment#{comment.id}"),
- :commenturl => url_for(:host => SERVER_URL,
- :controller => "diary_entry",
- :action => "view",
- :display_name => comment.diary_entry.user.display_name,
- :id => comment.diary_entry.id,
- :anchor => "newcomment"),
- :replyurl => url_for(:host => SERVER_URL,
- :controller => "message",
- :action => "new",
- :user_id => comment.user.id,
- :title => "Re: #{comment.diary_entry.title}")
+ with_recipient_locale message.recipient do
+ @to_user = message.recipient.display_name
+ @from_user = message.sender.display_name
+ @text = message.body
+ @title = message.title
+ @readurl = message_url(message)
+ @replyurl = reply_message_url(message)
+ @author = @from_user
+
+ attach_user_avatar(message.sender)
+
+ mail :from => from_address(message.sender.display_name, "m", message.id, message.digest),
+ :to => message.recipient.email,
+ :subject => I18n.t("notifier.message_notification.subject_header", :subject => message.title)
+ end
+ end
+
+ def diary_comment_notification(comment, recipient)
+ with_recipient_locale recipient do
+ @to_user = recipient.display_name
+ @from_user = comment.user.display_name
+ @text = comment.body
+ @title = comment.diary_entry.title
+ @readurl = url_for(:controller => "diary_entry",
+ :action => "view",
+ :display_name => comment.diary_entry.user.display_name,
+ :id => comment.diary_entry.id,
+ :anchor => "comment#{comment.id}")
+ @commenturl = url_for(:controller => "diary_entry",
+ :action => "view",
+ :display_name => comment.diary_entry.user.display_name,
+ :id => comment.diary_entry.id,
+ :anchor => "newcomment")
+ @replyurl = new_message_url(comment.user, :message => { :title => "Re: #{comment.diary_entry.title}" })
+
+ @author = @from_user
+
+ attach_user_avatar(comment.user)
+
+ mail :from => from_address(comment.user.display_name, "c", comment.id, comment.digest, recipient.id),
+ :to => recipient.email,
+ :subject => I18n.t("notifier.diary_comment_notification.subject", :user => comment.user.display_name)
+ end