diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-01-24 10:36:38 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-01-24 10:36:38 +0000 |
| commit | 1445541f487fe22ec44b71607be3300319338d0a (patch) | |
| tree | 5c9ed659c968f092317de6bab59a712e2584ca66 /app/mailers | |
| parent | 4eb8432dedc8b521086cdf163ebe5d373396d39a (diff) | |
| parent | b0a939a4d44077b4602176042ff4432b790561ad (diff) | |
Merge branch 'release/0.16'0.16
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/request_mailer.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/mailers/request_mailer.rb b/app/mailers/request_mailer.rb index 13b3bc4a1..af1a75df9 100644 --- a/app/mailers/request_mailer.rb +++ b/app/mailers/request_mailer.rb @@ -19,7 +19,8 @@ class RequestMailer < ApplicationMailer end mail(:from => from_user.name_and_email, - :to => info_request.incoming_name_and_email) + :to => info_request.incoming_name_and_email, + :subject => info_request.email_subject_followup) end # Used when a response is uploaded using the API @@ -63,7 +64,7 @@ class RequestMailer < ApplicationMailer mail(:from => user.name_and_email, :to => contact_from_name_and_email, - :subject => _("FOI response requires admin ({{reason}}) - {{title}}", :reason => info_request.described_state, :title => info_request.title)) + :subject => _("FOI response requires admin ({{reason}}) - {{title}}", :reason => info_request.described_state, :title => info_request.title).html_safe) end # Tell the requester that a new response has arrived @@ -79,7 +80,7 @@ class RequestMailer < ApplicationMailer mail(:from => contact_from_name_and_email, :to => info_request.user.name_and_email, - :subject => _("New response to your FOI request - ") + info_request.title, + :subject => (_("New response to your FOI request - ") + info_request.title).html_safe, :charset => "UTF-8", # not much we can do if the user's email is broken :reply_to => contact_from_name_and_email) @@ -182,7 +183,7 @@ class RequestMailer < ApplicationMailer mail(:from => contact_from_name_and_email, :to => info_request.user.name_and_email, - :subject => _("Clarify your FOI request - ") + info_request.title) + :subject => (_("Clarify your FOI request - ") + info_request.title).html_safe) end # Tell requester that somebody add an annotation to their request |