##// END OF EJS Templates
tests: Fix --without-vcsserver parameter...
tests: Fix --without-vcsserver parameter Ensuring now that we always disable the vcsserver auto start for the test suite, since the test suite bootstraps its own vcsserver process. Also enhanced TestINI.

File last commit:

r549:a7fac4dd default
r816:43fb99bf default
Show More
pull_request_comment.mako
98 lines | 3.2 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: optimize some labels, and made few i18n fixes....
r532
project: added all source files and assets
r1 <%def name="subject()" 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,
}
%>
${_('[mention]') if mention else ''} \
% if comment_file:
emails: bring back no-escape in titles as those...
r547 ${_('%(user)s commented 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: bring back no-escape in titles as those...
r547 ${_('%(user)s commented 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: bring back no-escape in titles as those...
r547 ${_('%(user)s commented 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>
<%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,
}
%>
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,
}
%>
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;">
<h4><a href="${pr_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">
% if comment_file:
${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s" (file:`%(comment_file)s`)') % data |n}
% else:
${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s"') % data |n}
% endif
</a>
%if status_change and not closing_pr:
, ${_('submitted pull request status: %(status)s') % data}
%elif status_change and closing_pr:
, ${_('submitted pull request status: %(status)s and closed') % data}
%endif
</h4>
</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 new tags to status sent...
r548 % if status_change:
<tr><td style="padding-right:20px;">${_('Submitted status')}</td><td>${base.status_text(status_change, tag_type=status_change_type)}</td></tr>
% endif
notifications: adding pre-wrap to descriptions in emails
r549 <tr><td style="padding-right:20px;">${(_('Comment on line: %(comment_line)s') if comment_file else _('Comment')) % data}</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>