# HG changeset patch # User Marcin Kuzminski # Date 2016-08-03 11:00:10 # Node ID be8e7f94c4adc58728ffbe018978dac2db76f0d2 # Parent c224f1f24893c921a94c47dcb28c690b7a719f46 emails: bring back no-escape in titles as those create html and email clients escape resulting in escaped html tags in email titles diff --git a/rhodecode/templates/email_templates/commit_comment.mako b/rhodecode/templates/email_templates/commit_comment.mako --- 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 --- 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