Mercurial > kallithea
changeset 3258:6f71e6f81c9f beta
Fix bold beeing not escaped in emails and make the email form more consistent
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Tue, 29 Jan 2013 22:41:05 +0100 |
| parents | 32a283e5fd0d |
| children | 99cb0cf75a4c |
| files | rhodecode/templates/email_templates/pull_request.html rhodecode/templates/email_templates/pull_request_comment.html |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/templates/email_templates/pull_request.html Tue Jan 29 22:40:29 2013 +0100 +++ b/rhodecode/templates/email_templates/pull_request.html Tue Jan 29 22:41:05 2013 +0100 @@ -2,9 +2,9 @@ <%inherit file="main.html"/> ${_('User %s opened pull request for repository %s and wants you to review changes.') % (('<b>%s</b>' % pr_user_created),pr_repo_url) |n} +<div>${_('View this pull request here')}: ${pr_url}</div> <div>${_('title')}: ${pr_title}</div> <div>${_('description')}:</div> -<div>${_('View this pull request here')}: ${pr_url}</div> <p> ${body} </p>
--- a/rhodecode/templates/email_templates/pull_request_comment.html Tue Jan 29 22:40:29 2013 +0100 +++ b/rhodecode/templates/email_templates/pull_request_comment.html Tue Jan 29 22:41:05 2013 +0100 @@ -1,7 +1,8 @@ ## -*- coding: utf-8 -*- <%inherit file="main.html"/> -${_('User %s commented on pull request #%s for repository %s') % ('<b>%s</b>' % pr_comment_user ,pr_id,pr_target_repo)} +${_('User %s commented on pull request #%s for repository %s') % ('<b>%s</b>' % pr_comment_user, pr_id, pr_target_repo) |n} +<div>${_('View this comment here')}: ${pr_comment_url}</div> <p> ${body} @@ -11,4 +12,4 @@ %endif </p> -${_('View this comment here')}: ${pr_comment_url} +