cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Contrary to what the previous commit message said, we do actually have more cases of user A triggering mail to user B.

Browse source 
(references #1968)
This commit is contained in:
Thomas Wood 2009-06-20 20:42:22 +00:00
parent 0ed4cdbd49
commit 554818b5b4
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/notifier.rb
View file

@ -53,7 +53,7 @@ class Notifier < ActionMailer::Base
def message_notification(message) def message_notification(message)
common_headers message.recipient common_headers message.recipient
subject I18n.t('notifier.message_notification.subject', :user => message.sender.display_name) subject I18n.t('notifier.message_notification.subject', :user => message.sender.display_name, :locale => locale)
body :to_user => message.recipient.display_name, body :to_user => message.recipient.display_name,
:from_user => message.sender.display_name, :from_user => message.sender.display_name,
:body => message.body, :body => message.body,
@ -97,7 +97,7 @@ class Notifier < ActionMailer::Base
befriendee = User.find_by_id(friend.friend_user_id) befriendee = User.find_by_id(friend.friend_user_id)
common_headers befriendee common_headers befriendee
subject I18n.t('notifier.friend_notification.subject', :user => befriender.display_name) subject I18n.t('notifier.friend_notification.subject', :user => befriender.display_name, :locale => locale)
body :user => befriender.display_name, body :user => befriender.display_name,
:userurl => url_for(:host => SERVER_URL, :userurl => url_for(:host => SERVER_URL,
:controller => "user", :action => "view", :controller => "user", :action => "view",