Changeset - 67e561f832b2
[Not reviewed]
default
0 4 0
Thomas De Schampheleire - 8 years ago 2018-02-06 21:42:50
thomas.de_schampheleire@nokia.com
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.
4 files changed with 20 insertions and 20 deletions:
0 comments (0 inline, 0 general)
kallithea/templates/email_templates/pull_request.html
Show inline comments
 
@@ -3,30 +3,30 @@
 
<%block name="header">\
 
<% title = _('Mention on Pull Request %s "%s" by %s') % (pr_nice_id, pr_title, pr_user_created) if is_mention else _('Added as Reviewer of Pull Request %s "%s" by %s') % (pr_nice_id, pr_title, pr_user_created) %>\
 
<%include file="header.html" args="title=title,link=pr_url"/>\
 
</%block>\
 
\
 
<table cellpadding="0" cellspacing="0" border="0" width="100%">
 
    <tr>
 
        <td>
 
            <div>
 
                ${_('Pull request from')}
 
                <a style="${link_text_style}"
 
                   href="${pr_source_repo}">${pr_source_repo}</a>
 
                ${_('at')}
 
                ${_('branch')}
 
                <span style="${data_style}">${pr_source_branch}</span>
 
                ${_('to')}
 
                <a style="${link_text_style}"
 
                   href="${pr_target_repo}">${pr_target_repo}</a>
 
                ${_('at')}
 
                ${_('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 height="10px" style="height:10px"></td></tr>
 
    <tr>
kallithea/templates/email_templates/pull_request.txt
Show inline comments
 
<%block name="header">\
 
<% title = _('Mention on Pull Request %s "%s" by %s') % (pr_nice_id, pr_title, pr_user_created) if is_mention else _('Added as Reviewer of Pull Request %s "%s" by %s') % (pr_nice_id, pr_title, pr_user_created) %>\
 
<%include file="header.txt" args="title=title,link=pr_url"/>\
 
</%block>\
 

	
 
${_('Pull request from')|n,unicode} \
 
${pr_source_repo|n,unicode} \
 
${_('at')|n,unicode} \
 
${_('branch')|n,unicode} \
 
${pr_source_branch|n,unicode} \
 
${_('to')|n,unicode} \
 
${pr_target_repo|n,unicode} \
 
${_('at')|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}.
 

	
 

	
 
${_('Description')|n,unicode}:
 

	
 
${body|n,unicode}
 

	
 

	
kallithea/templates/email_templates/pull_request_comment.txt
Show inline comments
 
<%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} \
 
${_('at')|n,unicode} \
 
${_('branch')|n,unicode} \
 
${pr_source_branch|n,unicode} \
 
${_('to')|n,unicode} \
 
${pr_target_repo|n,unicode} \
 
${_('at')|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')"/>\
kallithea/tests/models/test_dump_html_mails.ref.html
Show inline comments
 
@@ -882,25 +882,25 @@ View User Profile: http://newbie.org
 
<h1>pull_request, is_mention=False</h1>
 
<pre>
 
From: u1
 
To: u2@example.com
 
Subject: [Review] repo/name PR #7 "The Title" from devbranch by u2
 
</pre>
 
<hr/>
 
<pre>http://pr.org/7
 

	
 
Added as Reviewer of Pull Request #7 "The Title" by Requesting User (root)
 

	
 

	
 
Pull request from https://dev.org/repo at devbranch to http://mainline.com/repo at trunk:
 
Pull request from https://dev.org/repo branch devbranch to http://mainline.com/repo branch trunk:
 
#7 "The Title" by u2 u3 (u2).
 

	
 

	
 
Description:
 

	
 
This PR is 'awesome' because it does <stuff>
 
 - please approve indented!
 

	
 

	
 
Changesets:
 

	
 
Introduce one and two
 
@@ -950,30 +950,30 @@ View Pull Request: http://pr.org/7
 
                    <td height="30px" style="height:30px" colspan="3"></td>
 
                </tr>
 
                <tr>
 
                    <td></td>
 
                    <td>
 
<table cellpadding="0" cellspacing="0" border="0" width="100%">
 
    <tr>
 
        <td>
 
            <div>
 
                Pull request from
 
                <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
 
                   href="https://dev.org/repo">https://dev.org/repo</a>
 
                at
 
                branch
 
                <span style="border:#ddd 1px solid;background:#f9f9f9">devbranch</span>
 
                to
 
                <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
 
                   href="http://mainline.com/repo">http://mainline.com/repo</a>
 
                at
 
                branch
 
                <span style="border:#ddd 1px solid;background:#f9f9f9">trunk</span>
 
            </div>
 
            <div>
 
                <a style="color:#395fa0;text-decoration:none"
 
                   href="http://pr.org/7">#7 "The Title"</a>
 
                by
 
                <span style="border:#ddd 1px solid;background:#f9f9f9">u2 u3 (u2)</span>.
 
            </div>
 
        </td>
 
    </tr>
 
    <tr><td height="10px" style="height:10px"></td></tr>
 
    <tr>
 
@@ -1070,25 +1070,25 @@ View Pull Request: http://pr.org/7
 
<h1>pull_request, is_mention=True</h1>
 
<pre>
 
From: u1
 
To: u2@example.com
 
Subject: [Review] repo/name PR #7 "The Title" from devbranch by u2
 
</pre>
 
<hr/>
 
<pre>http://pr.org/7
 

	
 
Mention on Pull Request #7 "The Title" by Requesting User (root)
 

	
 

	
 
Pull request from https://dev.org/repo at devbranch to http://mainline.com/repo at trunk:
 
Pull request from https://dev.org/repo branch devbranch to http://mainline.com/repo branch trunk:
 
#7 "The Title" by u2 u3 (u2).
 

	
 

	
 
Description:
 

	
 
This PR is 'awesome' because it does <stuff>
 
 - please approve indented!
 

	
 

	
 
Changesets:
 

	
 
Introduce one and two
 
@@ -1138,30 +1138,30 @@ View Pull Request: http://pr.org/7
 
                    <td height="30px" style="height:30px" colspan="3"></td>
 
                </tr>
 
                <tr>
 
                    <td></td>
 
                    <td>
 
<table cellpadding="0" cellspacing="0" border="0" width="100%">
 
    <tr>
 
        <td>
 
            <div>
 
                Pull request from
 
                <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
 
                   href="https://dev.org/repo">https://dev.org/repo</a>
 
                at
 
                branch
 
                <span style="border:#ddd 1px solid;background:#f9f9f9">devbranch</span>
 
                to
 
                <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
 
                   href="http://mainline.com/repo">http://mainline.com/repo</a>
 
                at
 
                branch
 
                <span style="border:#ddd 1px solid;background:#f9f9f9">trunk</span>
 
            </div>
 
            <div>
 
                <a style="color:#395fa0;text-decoration:none"
 
                   href="http://pr.org/7">#7 "The Title"</a>
 
                by
 
                <span style="border:#ddd 1px solid;background:#f9f9f9">u2 u3 (u2)</span>.
 
            </div>
 
        </td>
 
    </tr>
 
    <tr><td height="10px" style="height:10px"></td></tr>
 
    <tr>
 
@@ -1265,25 +1265,25 @@ Subject: [Comment] repo/name PR #7 "The 
 
<pre>http://pr.org/comment
 

	
 
Comment on Pull Request #7 "The Title"
 

	
 

	
 
Opinionated User (jsmith):
 

	
 
Me too!
 

	
 
 - and indented on second line
 

	
 

	
 
Pull request from https://dev.org/repo at devbranch to http://mainline.com/repo at trunk:
 
Pull request from https://dev.org/repo branch devbranch to http://mainline.com/repo branch trunk:
 
#7 "The Title" by u2 u3 (u2).
 

	
 

	
 
View Comment: http://pr.org/comment
 
</pre>
 
<hr/>
 
<!--!doctype html-->
 
<!--html lang="en"-->
 
<!--head-->
 
    <!--title--><!--/title-->
 
    <!--meta name="viewport" content="width=device-width"-->
 
    <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
 
@@ -1429,25 +1429,25 @@ Subject: [Comment] repo/name PR #7 "The 
 
<pre>http://pr.org/comment
 

	
 
Mention in Comment on Pull Request #7 "The Title"
 

	
 

	
 
Opinionated User (jsmith):
 

	
 
Me too!
 

	
 
 - and indented on second line
 

	
 

	
 
Pull request from https://dev.org/repo at devbranch to http://mainline.com/repo at trunk:
 
Pull request from https://dev.org/repo branch devbranch to http://mainline.com/repo branch trunk:
 
#7 "The Title" by u2 u3 (u2).
 

	
 

	
 
View Comment: http://pr.org/comment
 
</pre>
 
<hr/>
 
<!--!doctype html-->
 
<!--html lang="en"-->
 
<!--head-->
 
    <!--title--><!--/title-->
 
    <!--meta name="viewport" content="width=device-width"-->
 
    <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
 
@@ -1595,25 +1595,25 @@ Subject: [Under Review: Comment] repo/na
 
Comment on Pull Request #7 "The Title"
 

	
 

	
 
Opinionated User (jsmith):
 

	
 
Status change: Under Review
 

	
 
Me too!
 

	
 
 - and indented on second line
 

	
 

	
 
Pull request from https://dev.org/repo at devbranch to http://mainline.com/repo at trunk:
 
Pull request from https://dev.org/repo branch devbranch to http://mainline.com/repo branch trunk:
 
#7 "The Title" by u2 u3 (u2).
 

	
 

	
 
View Comment: http://pr.org/comment
 
</pre>
 
<hr/>
 
<!--!doctype html-->
 
<!--html lang="en"-->
 
<!--head-->
 
    <!--title--><!--/title-->
 
    <!--meta name="viewport" content="width=device-width"-->
 
    <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
 
@@ -1777,25 +1777,25 @@ Subject: [Under Review: Comment] repo/na
 
Mention in Comment on Pull Request #7 "The Title"
 

	
 

	
 
Opinionated User (jsmith):
 

	
 
Status change: Under Review
 

	
 
Me too!
 

	
 
 - and indented on second line
 

	
 

	
 
Pull request from https://dev.org/repo at devbranch to http://mainline.com/repo at trunk:
 
Pull request from https://dev.org/repo branch devbranch to http://mainline.com/repo branch trunk:
 
#7 "The Title" by u2 u3 (u2).
 

	
 

	
 
View Comment: http://pr.org/comment
 
</pre>
 
<hr/>
 
<!--!doctype html-->
 
<!--html lang="en"-->
 
<!--head-->
 
    <!--title--><!--/title-->
 
    <!--meta name="viewport" content="width=device-width"-->
 
    <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
 
@@ -1959,25 +1959,25 @@ Subject: [Closing: Comment] repo/name PR
 
Pull Request #7 "The Title" Closed
 

	
 

	
 
Opinionated User (jsmith):
 

	
 
The pull request has been closed.
 

	
 
Me too!
 

	
 
 - and indented on second line
 

	
 

	
 
Pull request from https://dev.org/repo at devbranch to http://mainline.com/repo at trunk:
 
Pull request from https://dev.org/repo branch devbranch to http://mainline.com/repo branch trunk:
 
#7 "The Title" by u2 u3 (u2).
 

	
 

	
 
View Comment: http://pr.org/comment
 
</pre>
 
<hr/>
 
<!--!doctype html-->
 
<!--html lang="en"-->
 
<!--head-->
 
    <!--title--><!--/title-->
 
    <!--meta name="viewport" content="width=device-width"-->
 
    <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
 
@@ -2140,25 +2140,25 @@ Subject: [Closing: Comment] repo/name PR
 
Mention in Comment on Pull Request #7 "The Title"
 

	
 

	
 
Opinionated User (jsmith):
 

	
 
The pull request has been closed.
 

	
 
Me too!
 

	
 
 - and indented on second line
 

	
 

	
 
Pull request from https://dev.org/repo at devbranch to http://mainline.com/repo at trunk:
 
Pull request from https://dev.org/repo branch devbranch to http://mainline.com/repo branch trunk:
 
#7 "The Title" by u2 u3 (u2).
 

	
 

	
 
View Comment: http://pr.org/comment
 
</pre>
 
<hr/>
 
<!--!doctype html-->
 
<!--html lang="en"-->
 
<!--head-->
 
    <!--title--><!--/title-->
 
    <!--meta name="viewport" content="width=device-width"-->
 
    <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
 
@@ -2323,25 +2323,25 @@ Pull Request #7 "The Title" Closed
 

	
 
Opinionated User (jsmith):
 

	
 
Status change: Under Review
 

	
 
The pull request has been closed.
 

	
 
Me too!
 

	
 
 - and indented on second line
 

	
 

	
 
Pull request from https://dev.org/repo at devbranch to http://mainline.com/repo at trunk:
 
Pull request from https://dev.org/repo branch devbranch to http://mainline.com/repo branch trunk:
 
#7 "The Title" by u2 u3 (u2).
 

	
 

	
 
View Comment: http://pr.org/comment
 
</pre>
 
<hr/>
 
<!--!doctype html-->
 
<!--html lang="en"-->
 
<!--head-->
 
    <!--title--><!--/title-->
 
    <!--meta name="viewport" content="width=device-width"-->
 
    <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
 
@@ -2510,25 +2510,25 @@ Mention in Comment on Pull Request #7 "T
 

	
 
Opinionated User (jsmith):
 

	
 
Status change: Under Review
 

	
 
The pull request has been closed.
 

	
 
Me too!
 

	
 
 - and indented on second line
 

	
 

	
 
Pull request from https://dev.org/repo at devbranch to http://mainline.com/repo at trunk:
 
Pull request from https://dev.org/repo branch devbranch to http://mainline.com/repo branch trunk:
 
#7 "The Title" by u2 u3 (u2).
 

	
 

	
 
View Comment: http://pr.org/comment
 
</pre>
 
<hr/>
 
<!--!doctype html-->
 
<!--html lang="en"-->
 
<!--head-->
 
    <!--title--><!--/title-->
 
    <!--meta name="viewport" content="width=device-width"-->
 
    <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
0 comments (0 inline, 0 general)