From: Thomas Wood <grand.edgemaster@gmail.com>
Date: Sat, 20 Jun 2009 20:42:22 +0000 (+0000)
Subject: Contrary to what the previous commit message said, we do actually have more cases... 
X-Git-Tag: live~6974
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/554818b5b44fa359c50f5b68ea038bbb7a106069?ds=sidebyside

Contrary to what the previous commit message said, we do actually have more cases of user A triggering mail to user B.
(references #1968)
---

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 2313e97ce..ba4530e99 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -53,7 +53,7 @@ class Notifier < ActionMailer::Base
   
   def message_notification(message)
     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,
          :from_user => message.sender.display_name,
          :body => message.body,
@@ -97,7 +97,7 @@ class Notifier < ActionMailer::Base
     befriendee = User.find_by_id(friend.friend_user_id)
 
     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,
          :userurl => url_for(:host => SERVER_URL,
                              :controller => "user", :action => "view",