From 3b24829209f43eb48c78d26ec208a8fbcfd7bdb3 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 3 Aug 2016 13:00:10 +0200
Subject: [PATCH] emails: bring back no-escape in titles as those create html
 and email clients escape resulting in escaped html tags in email titles

---
 rhodecode/templates/email_templates/commit_comment.mako     | 6 +++---
 .../templates/email_templates/pull_request_comment.mako     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/rhodecode/templates/email_templates/commit_comment.mako b/rhodecode/templates/email_templates/commit_comment.mako
index 9b54ac4a..d9f05965 100644
--- a/rhodecode/templates/email_templates/commit_comment.mako
+++ b/rhodecode/templates/email_templates/commit_comment.mako
@@ -16,12 +16,12 @@ data = {
 ${_('[mention]') if mention else ''} \
 
 % if comment_file:
-    ${_('%(user)s commented on commit `%(commit_id)s` (file: `%(comment_file)s`)') % data} ${_('in the %(repo_name)s repository') % data}
+    ${_('%(user)s commented on commit `%(commit_id)s` (file: `%(comment_file)s`)') % data} ${_('in the %(repo_name)s repository') % data |n}
 % else:
     % if status_change:
-    ${_('%(user)s commented on commit `%(commit_id)s` (status: %(status)s)') % data |n} ${_('in the %(repo_name)s repository') % data}
+    ${_('%(user)s commented on commit `%(commit_id)s` (status: %(status)s)') % data |n} ${_('in the %(repo_name)s repository') % data |n}
     % else:
-    ${_('%(user)s commented on commit `%(commit_id)s`') % data |n} ${_('in the %(repo_name)s repository') % data}
+    ${_('%(user)s commented on commit `%(commit_id)s`') % data |n} ${_('in the %(repo_name)s repository') % data |n}
     % endif
 % endif
 
diff --git a/rhodecode/templates/email_templates/pull_request_comment.mako b/rhodecode/templates/email_templates/pull_request_comment.mako
index af3a0083..391824cc 100644
--- a/rhodecode/templates/email_templates/pull_request_comment.mako
+++ b/rhodecode/templates/email_templates/pull_request_comment.mako
@@ -17,12 +17,12 @@ data = {
 ${_('[mention]') if mention else ''} \
 
 % if comment_file:
-    ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s" (file: `%(comment_file)s`)') % data}
+    ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s" (file: `%(comment_file)s`)') % data |n}
 % else:
     % if status_change:
-    ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s" (status: %(status)s)') % data}
+    ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s" (status: %(status)s)') % data |n}
     % else:
-    ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s"') % data}
+    ${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s"') % data |n}
     % endif
 % endif
 </%def>