X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4028f4cdb91f616bc774dc9b9fa8c7183eb1f6dd..d1d4f8192da5a266cddb17bb8970b2b04387888c:/app/models/notifier.rb diff --git a/app/models/notifier.rb b/app/models/notifier.rb index a9bc0d101..13751560f 100644 --- a/app/models/notifier.rb +++ b/app/models/notifier.rb @@ -136,17 +136,17 @@ class Notifier < ActionMailer::Base @owner = recipient == comment.note.author @event = comment.event - if comment.author - @commenter = comment.author.display_name - else - @commenter = I18n.t("notifier.note_comment_notification.anonymous") - end - - if @owner - subject = I18n.t("notifier.note_comment_notification.#{@event}.subject_own", :commenter => @commenter) - else - subject = I18n.t("notifier.note_comment_notification.#{@event}.subject_other", :commenter => @commenter) - end + @commenter = if comment.author + comment.author.display_name + else + I18n.t("notifier.note_comment_notification.anonymous") + end + + subject = if @owner + I18n.t("notifier.note_comment_notification.#{@event}.subject_own", :commenter => @commenter) + else + I18n.t("notifier.note_comment_notification.#{@event}.subject_other", :commenter => @commenter) + end mail :to => recipient.email, :subject => subject end @@ -162,16 +162,23 @@ class Notifier < ActionMailer::Base @time = comment.created_at @changeset_author = comment.changeset.user.display_name - if @owner - subject = I18n.t("notifier.changeset_comment_notification.commented.subject_own", :commenter => @commenter) - else - subject = I18n.t("notifier.changeset_comment_notification.commented.subject_other", :commenter => @commenter) - end + subject = if @owner + I18n.t("notifier.changeset_comment_notification.commented.subject_own", :commenter => @commenter) + else + I18n.t("notifier.changeset_comment_notification.commented.subject_other", :commenter => @commenter) + end mail :to => recipient.email, :subject => subject end end + def new_issue_notification(recipient) + with_recipient_locale recipient do + subject = I18n.t("notifier.new_issue_notification.subject") + mail :to => recipient.email, :subject => subject + end + end + private def with_recipient_locale(recipient) @@ -187,4 +194,5 @@ class Notifier < ActionMailer::Base EMAIL_FROM end end + end