From 8b5d2b835a5f2418eff7f7360ede2408a7e498ed Mon Sep 17 00:00:00 2001 From: riking Date: Mon, 23 Jun 2014 17:46:22 -0700 Subject: [PATCH] Add case for bad reply key --- app/jobs/scheduled/poll_mailbox.rb | 2 ++ config/locales/server.en.yml | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/app/jobs/scheduled/poll_mailbox.rb b/app/jobs/scheduled/poll_mailbox.rb index abaf263430b..262ec0baa64 100644 --- a/app/jobs/scheduled/poll_mailbox.rb +++ b/app/jobs/scheduled/poll_mailbox.rb @@ -35,6 +35,8 @@ module Jobs message_template = :email_reject_empty when Email::Receiver::EmailUnparsableError message_template = :email_reject_parsing + when Email::Receiver::EmailLogNotFound + message_template = :email_reject_reply_key when ActiveRecord::Rollback message_template = :email_reject_post_error else diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index c859cb3a407..a3ecb298ff4 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1351,6 +1351,13 @@ en: The Markdown could not be processed. + email_reject_reply_key: + subject_template: "Message rejected: Bad Reply Key" + text_body_template: | + The message you've send to %{to} was rejected by the system. + + The provided reply key is invalid. + too_many_spam_flags: subject_template: "New account blocked" text_body_template: |