kallithea Changeset - 1de8abd9a4e1

Changeset - 1de8abd9a4e1

Parent rev.

Child rev.

[Not reviewed]

beta

0 6 0

Mads Kiilerich - 13 years ago 2013-04-04 12:12:38
madski@unity3d.com

emails: try to improve wording and layout - 1st iteration

6 files changed with 38 insertions and 40 deletions:

rhodecode/model/comment.py

rhodecode/templates/email_templates/changeset_comment.html

rhodecode/templates/email_templates/password_reset.html

rhodecode/templates/email_templates/pull_request.html

rhodecode/templates/email_templates/pull_request_comment.html

rhodecode/templates/email_templates/registration.html

0 comments (0 inline, 0 general)

rhodecode/model/comment.py

➞

Show inline comments

@@ @@ -88,13 +88,13 @@ class ChangesetCommentsModel(BaseModel): @@
+            )
             subj = safe_unicode(
                 h.link_to('Re changeset: %(desc)s %(line)s' % \
                           {'desc': desc, 'line': line},
                           _url)
+            )
-            email_subject = 'User %s commented on changeset %s' % \
             email_subject = '%s commented on changeset %s' % \
                 (user.username, h.short_id(revision))
             # get the current participants of this changeset
             recipients = ChangesetComment.get_users(revision=revision)
             # add changeset author if it's in rhodecode system
             cs_author = User.get_from_cs_author(cs.author)
             if not cs_author:
@@ @@ -124,25 +124,26 @@ class ChangesetCommentsModel(BaseModel): @@
                 h.link_to('Re pull request #%(pr_id)s: %(desc)s %(line)s' % \
                           {'desc': desc,
                            'pr_id': comment.pull_request.pull_request_id,
                            'line': line},
                           _url)
+            )
-            email_subject = 'User %s commented on pull request #%s' % \
             email_subject = '%s commented on pull request #%s' % \
                     (user.username, comment.pull_request.pull_request_id)
             # get the current participants of this pull request
             recipients = ChangesetComment.get_users(pull_request_id=
                                                 pull_request.pull_request_id)
             # add pull request author
             recipients += [pull_request.author]
             # add the reviewers to notification
             recipients += [x.user for x in pull_request.reviewers]
             #set some variables for email notification
             email_kwargs = {
                 'pr_title': pull_request.title,
                 'pr_id': pull_request.pull_request_id,
                 'status_change': status_change,
                 'closing_pr': closing_pr,
                 'pr_comment_url': _url,
                 'pr_comment_user': h.person(user.email),
                 'pr_target_repo': h.url('summary_home',

rhodecode/templates/email_templates/changeset_comment.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="main.html"/>
 ##message from user goes here
 <p>
 ${cs_comment_user}: <br/>
 <p>${_('URL')}: <a href="${cs_comment_url}">${cs_comment_url}</a></p>
 <h4>${_('%s commented on a %s changeset.') % (cs_comment_user,cs_target_repo) |n}</h4>
 <p>${_('Changeset')}: ${h.short_id(raw_id)}</p>
 <p>${_('Description')}:<br/>
 ${h.shorter(message, 256)}
 </p>
 %if status_change:
     <p>${_('The changeset status was changed to')}: <b>${status_change}</b></p>
 %endif
 <p>${_('Comment')}:<br/>
 ${body}
 </p>
 %if status_change:
     <span>${_('New status')} -&gt; ${status_change}</span>
 %endif
 <div>${_('View this comment here')}: ${cs_comment_url}</div>
 <pre>
 ${_('Repo')}: ${cs_target_repo}
 ${_('Changeset')}: ${h.short_id(raw_id)}
 ${_('desc')}: ${h.shorter(message, 256)}
 </pre>

rhodecode/templates/email_templates/password_reset.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="main.html"/>
 <h4>${_('Hello %s') % user}</h4>
 <div>${_('We received a request to create a new password for your account.')}</div>
 <div>${_('You can generate it by clicking following URL')}:</div>
 <p>${_('We received a request to create a new password for your account.')}</p>
 <p>${_('You can generate it by clicking following URL')}:</p>
 <pre>
 ${reset_url}
 </pre>
 <br/>
 ${_("If you did not request new password please ignore this email.")}
 <p>${_("Please ignore this email if you did not request a new password .")}</p>

rhodecode/templates/email_templates/pull_request.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="main.html"/>
 ${_('User %s opened pull request for repository %s and wants you to review changes.') % (('<b>%s</b>' % pr_user_created),pr_repo_url) |n}
 <div>${_('View this pull request here')}: ${pr_url}</div>
 <div>${_('title')}: ${pr_title}</div>
 <div>${_('description')}:</div>
 <p>
 ${body}
 </p>
 <p>${_('URL')}: <a href="${pr_url}">${pr_url}</a></p>
 <h4>${_('%s opened a pull request for repository %s and wants you to review changes.') % (pr_user_created,pr_repo_url) |n}</h4>
 <div>${_('revisions for reviewing')}</div>
 <p>${_('Title')}: <b>${pr_title}</b></p>
 <p>${_('Description')}:</p>
 <p style="white-space: pre-wrap;">${body}</p>
 <p>${_('Changesets')}:</p>
 <p style="white-space: pre-wrap;">
 %for r,r_msg in pr_revisions:
 <b>${h.short_id(r)}</b>:
 ${h.shorter(r_msg, 256)}
 %endfor
 </p>

rhodecode/templates/email_templates/pull_request_comment.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="main.html"/>
 ${_('Pull request #%s for repository %s') % (pr_id, pr_target_repo) |n}
 ##message from user goes here
 <p>
 ${pr_comment_user}: <br/>
 ${body}
 </p>
 <div>${_('View this comment here')}: ${pr_comment_url}</div>
 <p>${_('URL')}: <a href="${pr_comment_url}">${pr_comment_url}</a></p>
 <h4>${_('%s commented on pull request "%s"') % (pr_comment_user,pr_title) |n}</h4>
 %if status_change:
     %if closing_pr:
-       <span>${_('Closing pull request with status')} -&gt; ${status_change}</span>
+       <p>${_('Pull request was closed with status')}: <b>${status_change}</b></p>
     %else:
-       <span>${_('New status')} -&gt; ${status_change}</span>
+       <p>${_('Pull request changed status')}: <b>${status_change}</b></p>
     %endif
 %endif
 </p>
 <p>${_('Comment')}:</p>
 <p>${body}</p>

rhodecode/templates/email_templates/registration.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="main.html"/>
 ${_('A new user have registered in RhodeCode')}
 ${body}
 ${_('View this user here')}: ${registered_user_url}

0 comments (0 inline, 0 general)