# HG changeset patch
# User Daniel Dourvaris <daniel@rhodecode.com>
# Date 2020-07-24 07:51:14
# Node ID 2b31e8f817b10eba790863613f557e325815196f
# Parent  7aba7296aaf8b31464c01d2406d0dc2730c52199

notifications: properly inject the custom email headers into templates.

diff --git a/rhodecode/lib/utils.py b/rhodecode/lib/utils.py
--- a/rhodecode/lib/utils.py
+++ b/rhodecode/lib/utils.py
@@ -644,7 +644,7 @@ def load_rcextensions(root_path):
         rcextensions = None
 
     if rcextensions:
-        log.debug('Found rcextensions module loaded %s...', rcextensions)
+        log.info('Loaded rcextensions from %s...', rcextensions)
         rhodecode.EXTENSIONS = rcextensions
 
         # Additional mappings that are not present in the pygments lexers
diff --git a/rhodecode/model/notification.py b/rhodecode/model/notification.py
--- a/rhodecode/model/notification.py
+++ b/rhodecode/model/notification.py
@@ -384,7 +384,15 @@ class EmailNotificationModel(BaseModel):
         instance_url = h.route_url('home')
         _kwargs = {
             'instance_url': instance_url,
-            'whitespace_filter': self.whitespace_filter
+            'whitespace_filter': self.whitespace_filter,
+            'email_pr_update_subject_template': EMAIL_PR_UPDATE_SUBJECT_TEMPLATE,
+            'email_pr_review_subject_template': EMAIL_PR_REVIEW_SUBJECT_TEMPLATE,
+            'email_pr_comment_subject_template': EMAIL_PR_COMMENT_SUBJECT_TEMPLATE,
+            'email_pr_comment_status_change_subject_template': EMAIL_PR_COMMENT_STATUS_CHANGE_SUBJECT_TEMPLATE,
+            'email_pr_comment_file_subject_template': EMAIL_PR_COMMENT_FILE_SUBJECT_TEMPLATE,
+            'email_comment_subject_template': EMAIL_COMMENT_SUBJECT_TEMPLATE,
+            'email_comment_status_change_subject_template': EMAIL_COMMENT_STATUS_CHANGE_SUBJECT_TEMPLATE,
+            'email_comment_file_subject_template': EMAIL_COMMENT_FILE_SUBJECT_TEMPLATE,
         }
         _kwargs.update(kwargs)
         return _kwargs