##// END OF EJS Templates
docs: added 4.11.5 release notes
docs: added 4.11.5 release notes

File last commit:

r1728:49fb0cec default
r2629:2b5ee202 stable
Show More
pull_request_comment.mako
114 lines | 3.8 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"/>
project: added all source files and assets
r1
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),
'pr_title': pull_request.title,
'pr_id': pull_request.pull_request_id,
'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: 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 pull request #%(pr_id)s "%(pr_title)s" (file: `%(comment_file)s`)') % data |n}
emails: optimize some labels, and made few i18n fixes....
r532 % else:
% if status_change:
emails: added note types into emails. Fixes #5221
r1453 ${_('%(user)s left %(comment_type)s on pull request #%(pr_id)s "%(pr_title)s" (status: %(status)s)') % data |n}
emails: optimize some labels, and made few i18n fixes....
r532 % else:
emails: added note types into emails. Fixes #5221
r1453 ${_('%(user)s left %(comment_type)s on pull request #%(pr_id)s "%(pr_title)s"') % data |n}
emails: optimize some labels, and made few i18n fixes....
r532 % endif
% 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: optimize some labels, and made few i18n fixes....
r532 <%
data = {
'user': h.person(user),
'pr_title': pull_request.title,
'pr_id': pull_request.pull_request_id,
'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: optimize some labels, and made few i18n fixes....
r532 }
%>
project: added all source files and assets
r1 ${self.subject()}
* ${_('Comment link')}: ${pr_comment_url}
* ${_('Source repository')}: ${pr_source_repo_url}
%if comment_file:
* ${_('File: %(comment_file)s on line %(comment_line)s') % {'comment_file': comment_file, 'comment_line': comment_line}}
%endif
---
emails: optimize some labels, and made few i18n fixes....
r532 %if status_change and not closing_pr:
${_('%(user)s submitted pull request #%(pr_id)s status: *%(status)s*') % data}
%elif status_change and closing_pr:
${_('%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*') % data}
%endif
project: added all source files and assets
r1 ${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),
'pr_title': pull_request.title,
'pr_id': pull_request.pull_request_id,
'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: 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;">
% if comment_file:
emails: added note types into emails. Fixes #5221
r1453 <h4><a href="${pr_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s" (file:`%(comment_file)s`)') % data |n}</a></h4>
emails: optimize some labels, and made few i18n fixes....
r532 % else:
emails: added note types into emails. Fixes #5221
r1453 <h4><a href="${pr_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s"') % data |n}</a></h4>
emails: optimize some labels, and made few i18n fixes....
r532 % endif
emails: added note types into emails. Fixes #5221
r1453
emails: optimize some labels, and made few i18n fixes....
r532 </td></tr>
notifications: restyling email templates #4087
r508 <tr><td style="padding-right:20px;padding-top:15px;">${_('Source')}</td><td style="padding-top:15px;"><a style="color:#427cc9;text-decoration:none;cursor:pointer" href="${pr_source_repo_url}">${pr_source_repo.repo_name}</a></td></tr>
emails: added note types into emails. Fixes #5221
r1453
emails: added new tags to status sent...
r548 % if status_change:
emails: added note types into emails. Fixes #5221
r1453 <tr>
<td style="padding-right:20px;">${_('Status')}</td>
<td>
% if closing_pr:
${_('Closed pull request with status')}: ${base.status_text(status_change, tag_type=status_change_type)}
% else:
${_('Submitted review status')}: ${base.status_text(status_change, tag_type=status_change_type)}
% endif
</td>
</tr>
emails: added new tags to status sent...
r548 % 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>
notifications: restyling email templates #4087
r508 </table>