##// END OF EJS Templates
emails: try to improve wording and layout - 1st iteration
Mads Kiilerich -
r3780:1de8abd9 beta
parent child Browse files
Show More
@@ -91,7 +91,7 b' class ChangesetCommentsModel(BaseModel):'
91 91 {'desc': desc, 'line': line},
92 92 _url)
93 93 )
94 email_subject = 'User %s commented on changeset %s' % \
94 email_subject = '%s commented on changeset %s' % \
95 95 (user.username, h.short_id(revision))
96 96 # get the current participants of this changeset
97 97 recipients = ChangesetComment.get_users(revision=revision)
@@ -127,7 +127,7 b' class ChangesetCommentsModel(BaseModel):'
127 127 'line': line},
128 128 _url)
129 129 )
130 email_subject = 'User %s commented on pull request #%s' % \
130 email_subject = '%s commented on pull request #%s' % \
131 131 (user.username, comment.pull_request.pull_request_id)
132 132 # get the current participants of this pull request
133 133 recipients = ChangesetComment.get_users(pull_request_id=
@@ -140,6 +140,7 b' class ChangesetCommentsModel(BaseModel):'
140 140
141 141 #set some variables for email notification
142 142 email_kwargs = {
143 'pr_title': pull_request.title,
143 144 'pr_id': pull_request.pull_request_id,
144 145 'status_change': status_change,
145 146 'closing_pr': closing_pr,
@@ -1,17 +1,18 b''
1 1 ## -*- coding: utf-8 -*-
2 2 <%inherit file="main.html"/>
3 ##message from user goes here
4 <p>
5 ${cs_comment_user}: <br/>
3
4 <p>${_('URL')}: <a href="${cs_comment_url}">${cs_comment_url}</a></p>
5
6 <h4>${_('%s commented on a %s changeset.') % (cs_comment_user,cs_target_repo) |n}</h4>
7
8 <p>${_('Changeset')}: ${h.short_id(raw_id)}</p>
9 <p>${_('Description')}:<br/>
10 ${h.shorter(message, 256)}
11 </p>
12
13 %if status_change:
14 <p>${_('The changeset status was changed to')}: <b>${status_change}</b></p>
15 %endif
16 <p>${_('Comment')}:<br/>
6 17 ${body}
7 18 </p>
8 %if status_change:
9 <span>${_('New status')} -&gt; ${status_change}</span>
10 %endif
11 <div>${_('View this comment here')}: ${cs_comment_url}</div>
12
13 <pre>
14 ${_('Repo')}: ${cs_target_repo}
15 ${_('Changeset')}: ${h.short_id(raw_id)}
16 ${_('desc')}: ${h.shorter(message, 256)}
17 </pre>
@@ -2,10 +2,9 b''
2 2 <%inherit file="main.html"/>
3 3
4 4 <h4>${_('Hello %s') % user}</h4>
5 <div>${_('We received a request to create a new password for your account.')}</div>
6 <div>${_('You can generate it by clicking following URL')}:</div>
5 <p>${_('We received a request to create a new password for your account.')}</p>
6 <p>${_('You can generate it by clicking following URL')}:</p>
7 7 <pre>
8 8 ${reset_url}
9 9 </pre>
10 <br/>
11 ${_("If you did not request new password please ignore this email.")}
10 <p>${_("Please ignore this email if you did not request a new password .")}</p>
@@ -1,18 +1,19 b''
1 1 ## -*- coding: utf-8 -*-
2 2 <%inherit file="main.html"/>
3 3
4 ${_('User %s opened pull request for repository %s and wants you to review changes.') % (('<b>%s</b>' % pr_user_created),pr_repo_url) |n}
5 <div>${_('View this pull request here')}: ${pr_url}</div>
6 <div>${_('title')}: ${pr_title}</div>
7 <div>${_('description')}:</div>
8 <p>
9 ${body}
10 </p>
4 <p>${_('URL')}: <a href="${pr_url}">${pr_url}</a></p>
5
6 <h4>${_('%s opened a pull request for repository %s and wants you to review changes.') % (pr_user_created,pr_repo_url) |n}</h4>
11 7
12 <div>${_('revisions for reviewing')}</div>
8 <p>${_('Title')}: <b>${pr_title}</b></p>
9 <p>${_('Description')}:</p>
10 <p style="white-space: pre-wrap;">${body}</p>
11
12 <p>${_('Changesets')}:</p>
13 13 <p style="white-space: pre-wrap;">
14 14 %for r,r_msg in pr_revisions:
15 15 <b>${h.short_id(r)}</b>:
16 16 ${h.shorter(r_msg, 256)}
17
17 18 %endfor
18 19 </p>
@@ -1,18 +1,17 b''
1 1 ## -*- coding: utf-8 -*-
2 2 <%inherit file="main.html"/>
3 ${_('Pull request #%s for repository %s') % (pr_id, pr_target_repo) |n}
4 ##message from user goes here
5 <p>
6 ${pr_comment_user}: <br/>
7 ${body}
8 </p>
9 <div>${_('View this comment here')}: ${pr_comment_url}</div>
3
4 <p>${_('URL')}: <a href="${pr_comment_url}">${pr_comment_url}</a></p>
5
6 <h4>${_('%s commented on pull request "%s"') % (pr_comment_user,pr_title) |n}</h4>
10 7
11 8 %if status_change:
12 9 %if closing_pr:
13 <span>${_('Closing pull request with status')} -&gt; ${status_change}</span>
10 <p>${_('Pull request was closed with status')}: <b>${status_change}</b></p>
14 11 %else:
15 <span>${_('New status')} -&gt; ${status_change}</span>
12 <p>${_('Pull request changed status')}: <b>${status_change}</b></p>
16 13 %endif
17 14 %endif
18 </p>
15
16 <p>${_('Comment')}:</p>
17 <p>${body}</p>
@@ -1,9 +1,6 b''
1 1 ## -*- coding: utf-8 -*-
2 2 <%inherit file="main.html"/>
3 3
4 ${_('A new user have registered in RhodeCode')}
5
6 4 ${body}
7 5
8
9 6 ${_('View this user here')}: ${registered_user_url}
General Comments 0
You need to be logged in to leave comments. Login now