Contrary to what the previous commit message said, we do actually have more cases...
authorThomas Wood <grand.edgemaster@gmail.com>
Sat, 20 Jun 2009 20:42:22 +0000 (20:42 +0000)
committerThomas Wood <grand.edgemaster@gmail.com>
Sat, 20 Jun 2009 20:42:22 +0000 (20:42 +0000)
(references #1968)

app/models/notifier.rb

index 2313e97cefbe877e08d2e90304178c6b5df04427..ba4530e9927165c6f0cf352e41ae70fbb1bfd437 100644 (file)
@@ -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",