X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7d0a281d5bc03f2a981cbe6cb055fe19760f907d..82eedbf6511faf136293fce5ffc394ee0bf3511a:/app/models/notifier.rb?ds=inline diff --git a/app/models/notifier.rb b/app/models/notifier.rb index 84d097341..f025da7b1 100644 --- a/app/models/notifier.rb +++ b/app/models/notifier.rb @@ -1,38 +1,34 @@ - class Notifier < ActionMailer::Base def signup_confirm(user, token) - recipients user.email - from "webmaster@openstreetmap.org" - subject "[OpenStreetMap] Confirm your email address" - headers "Auto-Submitted" => "auto-generated" + common_headers user + 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 + + def email_confirm(user, token) + common_headers user + recipients user.new_email + subject I18n.t('notifier.email_confirm.subject') + body :address => user.new_email, + :url => url_for(:host => SERVER_URL, + :controller => "user", :action => "confirm_email", :confirm_string => token.token) end def lost_password(user, token) - recipients user.email - from "webmaster@openstreetmap.org" - subject "[OpenStreetMap] Password reset request" - headers "Auto-Submitted" => "auto-generated" + common_headers user + subject I18n.t('notifier.lost_password.subject') body :url => url_for(:host => SERVER_URL, :controller => "user", :action => "reset_password", - :email => user.email, :token => token.token) - end - - def reset_password(user, pass) - recipients user.email - from "webmaster@openstreetmap.org" - subject "[OpenStreetMap] Password reset" - headers "Auto-Submitted" => "auto-generated" - body :pass => pass + :token => token.token) end def gpx_success(trace, possible_points) - recipients trace.user.email - from "webmaster@openstreetmap.org" - subject "[OpenStreetMap] GPX Import success" - headers "Auto-Submitted" => "auto-generated" + common_headers trace.user + subject I18n.t('notifier.gpx_notification.success.subject') body :trace_name => trace.name, :trace_points => trace.size, :trace_description => trace.description, @@ -41,10 +37,9 @@ class Notifier < ActionMailer::Base end def gpx_failure(trace, error) - recipients trace.user.email + common_headers trace.user from "webmaster@openstreetmap.org" - subject "[OpenStreetMap] GPX Import failure" - headers "Auto-Submitted" => "auto-generated" + subject I18n.t('notifier.gpx_notification.failure.subject') body :trace_name => trace.name, :trace_description => trace.description, :trace_tags => trace.tags, @@ -52,14 +47,13 @@ class Notifier < ActionMailer::Base end def message_notification(message) - recipients message.recipient.email - from "webmaster@openstreetmap.org" - subject "[OpenStreetMap] #{message.sender.display_name} sent you a new message" - headers "Auto-Submitted" => "auto-generated" + common_headers message.recipient + from_header message.sender.display_name, "m", message.id, message.digest + 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, - :subject => message.title, + :title => message.title, :readurl => url_for(:host => SERVER_URL, :controller => "message", :action => "read", :message_id => message.id), @@ -69,14 +63,13 @@ class Notifier < ActionMailer::Base end def diary_comment_notification(comment) - recipients comment.diary_entry.user.email - from "webmaster@openstreetmap.org" - subject "[OpenStreetMap] #{comment.user.display_name} commented on your diary entry" - headers "Auto-Submitted" => "auto-generated" + common_headers comment.diary_entry.user + from_header comment.user.display_name, "c", comment.id, comment.digest + subject I18n.t('notifier.diary_comment_notification.subject', :user => comment.user.display_name, :locale => locale) body :to_user => comment.diary_entry.user.display_name, :from_user => comment.user.display_name, :body => comment.body, - :subject => comment.diary_entry.title, + :title => comment.diary_entry.title, :readurl => url_for(:host => SERVER_URL, :controller => "diary_entry", :action => "view", @@ -92,21 +85,45 @@ class Notifier < ActionMailer::Base :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) - 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 - recipients befriendee.email - from "webmaster@openstreetmap.org" - subject "[OpenStreetMap] #{befriender.display_name} added you as a friend" - headers "Auto-Submitted" => "auto-generated" - body :user => befriender.display_name, - :userurl => url_for(:host => SERVER_URL, - :controller => "user", :action => "view", - :display_name => befriender.display_name) + 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) + recipients recipient.email + locale recipient.preferred_language_from(I18n.available_locales) + from EMAIL_FROM + headers "return-path" => EMAIL_RETURN_PATH, + "Auto-Submitted" => "auto-generated" + end + + def from_header(name, type, id, digest) + if domain = MESSAGES_DOMAIN + from quote_address_if_necessary("#{name} <#{type}-#{id}-#{digest[0,6]}@#{domain}>", "utf-8") + end end end