X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ce4a6eefa7405a3d23f722c987f0e22b966defc8..85d17f257c338f668a1d17d9fc62a2f48ec84230:/app/models/notifier.rb?ds=inline diff --git a/app/models/notifier.rb b/app/models/notifier.rb index 1223d54b1..2fb00c96f 100644 --- a/app/models/notifier.rb +++ b/app/models/notifier.rb @@ -81,7 +81,7 @@ class Notifier < ActionMailer::Base @locale = comment.diary_entry.user.preferred_language_from(I18n.available_locales) @to_user = comment.diary_entry.user.display_name @from_user = comment.user.display_name - @body = comment.body + @text = comment.body @title = comment.diary_entry.title @readurl = url_for(:host => SERVER_URL, :controller => "diary_entry", @@ -114,6 +114,22 @@ class Notifier < ActionMailer::Base :subject => I18n.t('notifier.friend_notification.subject', :user => friend.befriender.display_name, :locale => @locale) 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 + + 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 from_address(name, type, id, digest)