Changeset - 67e561f832b2
Parent rev.
Child rev.
[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:
kallithea/templates/email_templates/pull_request.html
2
2
kallithea/templates/email_templates/pull_request.txt
2
2
kallithea/templates/email_templates/pull_request_comment.txt
2
2
kallithea/tests/models/test_dump_html_mails.ref.html
14
14
0 comments (0 inline, 0 general)
kallithea/templates/email_templates/pull_request.html
➞
Show inline comments
 
@@ -9,18 +9,18 @@
 
    <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')}
kallithea/templates/email_templates/pull_request.txt
➞
Show inline comments
 
@@ -2,17 +2,17 @@
 
<% 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}.

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/templates/email_templates/pull_request_comment.txt
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -4,17 +4,17 @@

			




	
	
	
		
 
</%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}.

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/tests/models/test_dump_html_mails.ref.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -888,13 +888,13 @@ Subject: [Review] repo/name PR #7 "The T

			




	
	
	
		
 
<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>

			




	
	
		
 
@@ -956,18 +956,18 @@ View Pull Request: http://pr.org/7

			




	
	
	
		
 
    <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

			




	
	
		
 
@@ -1076,13 +1076,13 @@ Subject: [Review] repo/name PR #7 "The T

			




	
	
	
		
 
<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>

			




	
	
		
 
@@ -1144,18 +1144,18 @@ View Pull Request: http://pr.org/7

			




	
	
	
		
 
    <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

			




	
	
		
 
@@ -1271,13 +1271,13 @@ 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/>

			




	
	
		
 
@@ -1435,13 +1435,13 @@ 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/>

			




	
	
		
 
@@ -1601,13 +1601,13 @@ 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/>

			




	
	
		
 
@@ -1783,13 +1783,13 @@ 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/>

			




	
	
		
 
@@ -1965,13 +1965,13 @@ 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/>

			




	
	
		
 
@@ -2146,13 +2146,13 @@ 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/>

			




	
	
		
 
@@ -2329,13 +2329,13 @@ 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/>

			




	
	
		
 
@@ -2516,13 +2516,13 @@ 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/>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.