Merge branch 'master' into openstreetbugs

This commit is contained in:
Tom Hughes 2010-06-27 16:29:52 +01:00
commit 02ad2f5a51
46 changed files with 928 additions and 182 deletions

View file

@ -48,7 +48,7 @@ class Notifier < ActionMailer::Base
def message_notification(message)
common_headers message.recipient
from_header message.sender.display_name, "m", message.id, message.digest
subject I18n.t('notifier.message_notification.subject', :user => message.sender.display_name, :locale => locale)
subject message.title
body :to_user => message.recipient.display_name,
:from_user => message.sender.display_name,
:body => message.body,