Mercurial > kallithea
changeset 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 | ae81bcb8a93d |
| children | 2d6ec8b9b633 |
| files | kallithea/templates/email_templates/pull_request.html kallithea/templates/email_templates/pull_request.txt kallithea/templates/email_templates/pull_request_comment.txt kallithea/tests/models/test_dump_html_mails.ref.html |
| diffstat | 4 files changed, 20 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/templates/email_templates/pull_request.html Tue Feb 06 21:34:48 2018 +0100 +++ b/kallithea/templates/email_templates/pull_request.html Tue Feb 06 21:42:50 2018 +0100 @@ -12,12 +12,12 @@ ${_('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/kallithea/templates/email_templates/pull_request.txt Tue Feb 06 21:34:48 2018 +0100 +++ b/kallithea/templates/email_templates/pull_request.txt Tue Feb 06 21:42:50 2018 +0100 @@ -5,11 +5,11 @@ ${_('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}" \
--- a/kallithea/templates/email_templates/pull_request_comment.txt Tue Feb 06 21:34:48 2018 +0100 +++ b/kallithea/templates/email_templates/pull_request_comment.txt Tue Feb 06 21:42:50 2018 +0100 @@ -7,11 +7,11 @@ ${_('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}" \
--- a/kallithea/tests/models/test_dump_html_mails.ref.html Tue Feb 06 21:34:48 2018 +0100 +++ b/kallithea/tests/models/test_dump_html_mails.ref.html Tue Feb 06 21:42:50 2018 +0100 @@ -891,7 +891,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). @@ -959,12 +959,12 @@ 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> @@ -1079,7 +1079,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). @@ -1147,12 +1147,12 @@ 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> @@ -1274,7 +1274,7 @@ - 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). @@ -1438,7 +1438,7 @@ - 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). @@ -1604,7 +1604,7 @@ - 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). @@ -1786,7 +1786,7 @@ - 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). @@ -1968,7 +1968,7 @@ - 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). @@ -2149,7 +2149,7 @@ - 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). @@ -2332,7 +2332,7 @@ - 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). @@ -2519,7 +2519,7 @@ - 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).