Mercurial > kallithea
view kallithea/templates/email_templates/pull_request_comment.txt @ 7165:67e561f832b2
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.
author | Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> |
---|---|
date | Tue, 06 Feb 2018 21:42:50 +0100 |
parents | 8b75085c2c02 |
children | 2d6ec8b9b633 |
line wrap: on
line source
<%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.txt" args="title=title,link=pr_comment_url"/>\ </%block>\ <%include file="comment.txt" args="text=body,author=pr_comment_user,status=status_change,close=closing_pr"/>\ ${_('Pull request from')|n,unicode} \ ${pr_source_repo|n,unicode} \ ${_('branch')|n,unicode} \ ${pr_source_branch|n,unicode} \ ${_('to')|n,unicode} \ ${pr_target_repo|n,unicode} \ ${_('branch')|n,unicode} \ ${pr_target_branch|n,unicode}: ${pr_nice_id|n,unicode} \ "${pr_title|n,unicode}" \ ${_('by')|n,unicode} \ ${pr_owner.full_name_and_username|n,unicode}. <%include file="button.txt" args="url=pr_comment_url,title=_('View Comment')"/>\