engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

emails: bring back no-escape in titles as those

Browse source 
create html and email clients escape resulting in escaped html tags in email titles
This commit is contained in:
Marcin Kuzminski 2016-08-03 13:00:10 +02:00
parent 96dc4c06fb
commit 3b24829209
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rhodecode/templates/email_templates/commit_comment.mako
View file

@ -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

6
rhodecode/templates/email_templates/pull_request_comment.mako
View file

@ -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>