diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/exim_log.rb | 6 | ||||
| -rw-r--r-- | app/models/request_mailer.rb | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/app/models/exim_log.rb b/app/models/exim_log.rb index 80535ab41..83f031a92 100644 --- a/app/models/exim_log.rb +++ b/app/models/exim_log.rb @@ -108,10 +108,10 @@ class EximLog < ActiveRecord::Base # be sure we are parsing the exim line right) envelope_from = " from <" + ir.incoming_email + "> " if !exim_log.line.include?(envelope_from) - raise "unexpected parsing of exim line" + $stderr.puts("unexpected parsing of exim line: [#{exim_log.line.chomp}]") + else + found = true end - - found = true end end if !found diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb index f46ce33c5..75dc58447 100644 --- a/app/models/request_mailer.rb +++ b/app/models/request_mailer.rb @@ -47,7 +47,7 @@ class RequestMailer < ApplicationMailer def requires_admin(info_request) @from = info_request.user.name_and_email @recipients = contact_from_name_and_email - @subject = "FOI response requires admin - " + info_request.title + @subject = _("FOI response requires admin - ") + info_request.title url = main_url(request_url(info_request)) admin_url = request_admin_url(info_request) @body = {:info_request => info_request, :url => url, :admin_url => admin_url } @@ -64,7 +64,7 @@ class RequestMailer < ApplicationMailer 'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834 'X-Auto-Response-Suppress' => 'OOF' @recipients = 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 @body = { :incoming_message => incoming_message, :info_request => info_request, :url => url } end @@ -83,7 +83,7 @@ class RequestMailer < ApplicationMailer 'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834 'X-Auto-Response-Suppress' => 'OOF' @recipients = user.name_and_email - @subject = "Delayed response to your FOI request - " + info_request.title + @subject = _("Delayed response to your FOI request - ") + info_request.title @body = { :info_request => info_request, :url => url } end @@ -102,7 +102,7 @@ class RequestMailer < ApplicationMailer 'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834 'X-Auto-Response-Suppress' => 'OOF' @recipients = user.name_and_email - @subject = "You're long overdue a response to your FOI request - " + info_request.title + @subject = _("You're long overdue a response to your FOI request - ") + info_request.title @body = { :info_request => info_request, :url => url } end @@ -122,7 +122,7 @@ class RequestMailer < ApplicationMailer 'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834 'X-Auto-Response-Suppress' => 'OOF' @recipients = info_request.user.name_and_email - @subject = "Was the response you got to your FOI request any good?" + @subject = _("Was the response you got to your FOI request any good?") @body = { :incoming_message => incoming_message, :info_request => info_request, :url => url } end @@ -165,7 +165,7 @@ class RequestMailer < ApplicationMailer 'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834 'X-Auto-Response-Suppress' => 'OOF' @recipients = info_request.user.name_and_email - @subject = "Somebody added a note to your FOI request - " + info_request.title + @subject = _("Somebody added a note to your FOI request - ") + info_request.title @body = { :comment => comment, :info_request => info_request, :url => main_url(comment_url(comment)) } end def comment_on_alert_plural(info_request, count, earliest_unalerted_comment) @@ -174,7 +174,7 @@ class RequestMailer < ApplicationMailer 'Auto-Submitted' => 'auto-generated', # http://tools.ietf.org/html/rfc3834 'X-Auto-Response-Suppress' => 'OOF' @recipients = info_request.user.name_and_email - @subject = "Some notes have been added to your FOI request - " + info_request.title + @subject = _("Some notes have been added to your FOI request - ") + info_request.title @body = { :count => count, :info_request => info_request, :url => main_url(comment_url(earliest_unalerted_comment)) } end |