From 0ed4cdbd4978e898c6232d011e86bcaf9973c2e6 Mon Sep 17 00:00:00 2001 From: Thomas Wood Date: Sat, 20 Jun 2009 20:36:52 +0000 Subject: [PATCH] Force locale on subject translation for diary comment notifications, since the sending user's locale is not that of recipient. It is assumed that sender locale is that of recipient for the rest of the emails, which is fine, since the sender is the recipient. The bodies are accounted for correctly by common_headers and the monkeypatching of ActionMailer. (references #1968) --- app/models/notifier.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/notifier.rb b/app/models/notifier.rb index 80a8ae485..2313e97ce 100644 --- a/app/models/notifier.rb +++ b/app/models/notifier.rb @@ -68,7 +68,7 @@ class Notifier < ActionMailer::Base def diary_comment_notification(comment) common_headers comment.diary_entry.user - subject I18n.t('notifier.diary_comment_notification.subject', :user => comment.user.display_name) + subject I18n.t('notifier.diary_comment_notification.subject', :user => comment.user.display_name, :locale => locale) body :to_user => comment.diary_entry.user.display_name, :from_user => comment.user.display_name, :body => comment.body, -- 2.43.2