From 222db71dd7046349fc831e8e2ef8aeb0c05c22b7 Mon Sep 17 00:00:00 2001
From: riking <rikingcoding@gmail.com>
Date: Mon, 23 Jun 2014 17:48:51 -0700
Subject: [PATCH] Cleanup

---
 app/jobs/scheduled/poll_mailbox.rb | 3 ++-
 config/locales/server.en.yml       | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/jobs/scheduled/poll_mailbox.rb b/app/jobs/scheduled/poll_mailbox.rb
index 262ec0baa6..d2162434d5 100644
--- a/app/jobs/scheduled/poll_mailbox.rb
+++ b/app/jobs/scheduled/poll_mailbox.rb
@@ -40,7 +40,7 @@ module Jobs
           when ActiveRecord::Rollback
             message_template = :email_reject_post_error
           else
-            nil
+            message_template = nil
         end
 
         if message_template
@@ -51,6 +51,7 @@ module Jobs
           Rails.logger.error e
 
           # If not known type, inform admins about the error
+          # (Add to above case with a good error message!)
           data = { limit_once_per: false, message_params: { from: message.from, source: message.body, error: "#{e.message}\n\n#{e.backtrace.join("\n")}" }}
           GroupMessage.create(Group[:admins].name, :email_error_notification, data)
         end
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index a3ecb298ff..a14b0d0abe 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1351,6 +1351,8 @@ en:
 
         The Markdown could not be processed.
 
+        %{error}
+
     email_reject_reply_key:
       subject_template: "Message rejected: Bad Reply Key"
       text_body_template: |