##// END OF EJS Templates
emails: fixed newlines in email templates that can break email sending code.
emails: fixed newlines in email templates that can break email sending code.

File last commit:

r1728:49fb0cec default
r1728:49fb0cec default
Show More
commit_comment.mako
105 lines | 3.6 KiB | application/x-mako | MakoHtmlLexer
project: added all source files and assets
r1 ## -*- coding: utf-8 -*-
<%inherit file="base.mako"/>
emails: added new tags to status sent...
r548 <%namespace name="base" file="base.mako"/>
emails: optimize some labels, and made few i18n fixes....
r532
emails: added note types into emails. Fixes #5221
r1453 ## EMAIL SUBJECT
emails: fixed newlines in email templates that can break email sending code.
r1728 <%def name="subject()" filter="n,trim,whitespace_filter">
emails: optimize some labels, and made few i18n fixes....
r532 <%
data = {
'user': h.person(user),
emails: use more consistent output between commits email and pull request email.
r535 'repo_name': repo_name,
'commit_id': h.show_id(commit),
'status': status_change,
emails: optimize some labels, and made few i18n fixes....
r532 'comment_file': comment_file,
'comment_line': comment_line,
emails: added note types into emails. Fixes #5221
r1453 'comment_type': comment_type,
emails: optimize some labels, and made few i18n fixes....
r532 }
%>
${_('[mention]') if mention else ''} \
% if comment_file:
emails: added note types into emails. Fixes #5221
r1453 ${_('%(user)s left %(comment_type)s on commit `%(commit_id)s` (file: `%(comment_file)s`)') % data} ${_('in the %(repo_name)s repository') % data |n}
emails: optimize some labels, and made few i18n fixes....
r532 % else:
emails: use more consistent output between commits email and pull request email.
r535 % if status_change:
emails: added note types into emails. Fixes #5221
r1453 ${_('%(user)s left %(comment_type)s on commit `%(commit_id)s` (status: %(status)s)') % data |n} ${_('in the %(repo_name)s repository') % data |n}
emails: use more consistent output between commits email and pull request email.
r535 % else:
emails: added note types into emails. Fixes #5221
r1453 ${_('%(user)s left %(comment_type)s on commit `%(commit_id)s`') % data |n} ${_('in the %(repo_name)s repository') % data |n}
emails: use more consistent output between commits email and pull request email.
r535 % endif
emails: optimize some labels, and made few i18n fixes....
r532 % endif
project: added all source files and assets
r1 </%def>
emails: added note types into emails. Fixes #5221
r1453 ## PLAINTEXT VERSION OF BODY
project: added all source files and assets
r1 <%def name="body_plaintext()" filter="n,trim">
emails: use more consistent output between commits email and pull request email.
r535 <%
data = {
'user': h.person(user),
'repo_name': repo_name,
'commit_id': h.show_id(commit),
'status': status_change,
'comment_file': comment_file,
'comment_line': comment_line,
emails: added note types into emails. Fixes #5221
r1453 'comment_type': comment_type,
emails: use more consistent output between commits email and pull request email.
r535 }
%>
project: added all source files and assets
r1 ${self.subject()}
* ${_('Comment link')}: ${commit_comment_url}
* ${_('Commit')}: ${h.show_id(commit)}
%if comment_file:
emails: added note types into emails. Fixes #5221
r1453 * ${_('File: %(comment_file)s on line %(comment_line)s') % data}
project: added all source files and assets
r1 %endif
---
%if status_change:
${_('Commit status was changed to')}: *${status_change}*
%endif
emails: use more consistent output between commits email and pull request email.
r535 ${comment_body|n}
notifications: restyling email templates #4087
r508 ${self.plaintext_footer()}
project: added all source files and assets
r1 </%def>
emails: optimize some labels, and made few i18n fixes....
r532
<%
data = {
'user': h.person(user),
'repo': commit_target_repo,
'repo_name': repo_name,
'commit_id': h.show_id(commit),
emails: added note types into emails. Fixes #5221
r1453 'comment_file': comment_file,
'comment_line': comment_line,
'comment_type': comment_type,
emails: optimize some labels, and made few i18n fixes....
r532 }
%>
notifications: restyling email templates #4087
r508 <table style="text-align:left;vertical-align:middle;">
emails: optimize some labels, and made few i18n fixes....
r532 <tr><td colspan="2" style="width:100%;padding-bottom:15px;border-bottom:1px solid #dbd9da;">
emails: added note types into emails. Fixes #5221
r1453
emails: use more consistent output between commits email and pull request email.
r535 % if comment_file:
<h4><a href="${commit_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('%(user)s commented on commit `%(commit_id)s` (file:`%(comment_file)s`)') % data}</a> ${_('in the %(repo)s repository') % data |n}</h4>
% else:
<h4><a href="${commit_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('%(user)s commented on commit `%(commit_id)s`') % data |n}</a> ${_('in the %(repo)s repository') % data |n}</h4>
% endif
emails: optimize some labels, and made few i18n fixes....
r532 </td></tr>
emails: added note types into emails. Fixes #5221
r1453
notifications: restyling email templates #4087
r508 <tr><td style="padding-right:20px;padding-top:15px;">${_('Commit')}</td><td style="padding-top:15px;"><a href="${commit_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${h.show_id(commit)}</a></td></tr>
notifications: adding pre-wrap to descriptions in emails
r549 <tr><td style="padding-right:20px;">${_('Description')}</td><td style="white-space:pre-wrap">${h.urlify_commit_message(commit.message, repo_name)}</td></tr>
emails: optimize some labels, and made few i18n fixes....
r532
% if status_change:
emails: added note types into emails. Fixes #5221
r1453 <tr><td style="padding-right:20px;">${_('Status')}</td>
<td>${_('The commit status was changed to')}: ${base.status_text(status_change, tag_type=status_change_type)}</td>
</tr>
emails: optimize some labels, and made few i18n fixes....
r532 % endif
emails: added note types into emails. Fixes #5221
r1453 <tr>
<td style="padding-right:20px;">
% if comment_type == 'todo':
${(_('TODO comment on line: %(comment_line)s') if comment_file else _('TODO comment')) % data}
% else:
${(_('Note comment on line: %(comment_line)s') if comment_file else _('Note comment')) % data}
% endif
</td>
<td style="line-height:1.2em;white-space:pre-wrap">${h.render(comment_body, renderer=renderer_type, mentions=True)}</td></tr>
emails: optimize some labels, and made few i18n fixes....
r532 </table>