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

Add error reply for new error

This commit is contained in:
riking 2014-08-13 11:47:21 -07:00
parent 90091972b9
commit b4dc8e7115
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

@ -43,6 +43,8 @@ module Jobs
message_template = :email_reject_parsing message_template = :email_reject_parsing
when Email::Receiver::EmailLogNotFound when Email::Receiver::EmailLogNotFound
message_template = :email_reject_reply_key message_template = :email_reject_reply_key
when Email::Receiver::BadDestinationAddress
message_template = :email_reject_destination
when ActiveRecord::Rollback when ActiveRecord::Rollback
message_template = :email_reject_post_error message_template = :email_reject_post_error
when Email::Receiver::InvalidPost when Email::Receiver::InvalidPost

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

@ -1440,6 +1440,13 @@ en:
The provided reply key is invalid or unknown, so we don't know what this email is in reply to. Contact a staff member. The provided reply key is invalid or unknown, so we don't know what this email is in reply to. Contact a staff member.
email_reject_destination:
subject_template: "Email issue -- Bad Destination Address(es)"
text_body_template: |
We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
None of the destination addresses are recognized by the forum. Please make sure that the forum is in the To: line (not CC or BCC), and that you are sending to the email address provided by the forum administrators.
email_error_notification: email_error_notification:
subject_template: "Email issue -- POP authentication error" subject_template: "Email issue -- POP authentication error"
text_body_template: | text_body_template: |