kallithea Files · kallithea/templates/email_templates/pull_request

Files @ 67e561f832b2

Branch filter:

Location: kallithea/kallithea/templates/email_templates/pull_request_comment.html

67e561f832b2 1.6 KiB text/html Show Annotation Show as Raw Download as Raw

Thomas De Schampheleire

email templates: align word to indicate branches: at / branch

Some email templates use '<repo> at <branch>' while others use
'<repo> branch <branch>'. Interestingly even some txt templates use one and
the corresponding HTML template uses the other.

This commit aligns all uses of 'at' and 'branch' to 'branch' as it is
considered more expressive.
The other choice would also be possible, as long as all users are
aligned.

<%inherit file="main.html"/>\
\
<%block name="header">\
<% title = _('Mention in Comment on Pull Request %s "%s"') % (pr_nice_id, pr_title) if is_mention else _('Pull Request %s "%s" Closed') % (pr_nice_id, pr_title) if closing_pr else _('Comment on Pull Request %s "%s"') % (pr_nice_id, pr_title) %>\
<%include file="header.html" args="title=title,link=pr_comment_url"/>\
</%block>\
\
<table cellpadding="0" cellspacing="0" border="0" width="100%">
    <tr>
        <td>
<%include file="comment.html" args="text=body,author=pr_comment_user,status=status_change,close=closing_pr"/>\
        </td>
    </tr>
    <tr>
        <td height="30px" style="height:30px"></td>
    </tr>
    <tr>
        <td>
            <div>
                ${_('Pull request from')}
                <a style="${link_text_style}"
                   href="${pr_source_repo}">${pr_source_repo}</a>
                ${_('branch')}
                <span style="${data_style}">${pr_source_branch}</span>
                ${_('to')}
                <a style="${link_text_style}"
                   href="${pr_target_repo}">${pr_target_repo}</a>
                ${_('branch')}
                <span style="${data_style}">${pr_target_branch}</span>:
            </div>
            <div>
                <a style="${link_style}"
                   href="${pr_url}">${pr_nice_id} "${pr_title}"</a>
                ${_('by')}
                <span style="${data_style}">${pr_owner.full_name_and_username}</span>.
            </div>
        </td>
    </tr>
    <tr>
        <td>
<%include file="button.html" args="url=pr_comment_url,title=_('View Comment'),padding_bottom=False"/>\
        </td>
    </tr>
</table>