X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/dc2a2c8ebd1a11e4a64555fda22c6859a51defff..243129b6712eeb2f9cda61e06d6698c01df18d0c:/app/models/notifier.rb diff --git a/app/models/notifier.rb b/app/models/notifier.rb index bc018cbe8..018226566 100644 --- a/app/models/notifier.rb +++ b/app/models/notifier.rb @@ -108,7 +108,7 @@ class Notifier < ActionMailer::Base :title => "Re: #{comment.diary_entry.title}") mail :from => from_address(comment.user.display_name, "c", comment.id, comment.digest), - :to => comment.diary_entry.user.email, + :to => comment.diary_entry.user.email, :subject => I18n.t("notifier.diary_comment_notification.subject", :user => comment.user.display_name) end end @@ -116,6 +116,12 @@ class Notifier < ActionMailer::Base def friend_notification(friend) with_recipient_locale friend.befriendee do @friend = friend + @viewurl = url_for(:host => SERVER_URL, + :controller => "user", :action => "view", + :display_name => @friend.befriender.display_name) + @friendurl = url_for(:host => SERVER_URL, + :controller => "user", :action => "make_friend", + :display_name => @friend.befriender.display_name) mail :to => friend.befriendee.email, :subject => I18n.t("notifier.friend_notification.subject", :user => friend.befriender.display_name)