Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add case for bad reply key

This commit is contained in:
riking 2014-06-23 17:46:22 -07:00
parent d2823fc5ee
commit 8b5d2b835a
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/jobs/scheduled/poll_mailbox.rb
View File

@ -35,6 +35,8 @@ module Jobs
message_template = :email_reject_empty message_template = :email_reject_empty
when Email::Receiver::EmailUnparsableError when Email::Receiver::EmailUnparsableError
message_template = :email_reject_parsing message_template = :email_reject_parsing
when Email::Receiver::EmailLogNotFound
message_template = :email_reject_reply_key
when ActiveRecord::Rollback when ActiveRecord::Rollback
message_template = :email_reject_post_error message_template = :email_reject_post_error
else else

7
config/locales/server.en.yml
View File

@ -1351,6 +1351,13 @@ en:
The Markdown could not be processed. 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: too_many_spam_flags:
subject_template: "New account blocked" subject_template: "New account blocked"
text_body_template: | text_body_template: |