# Date 2013-04-04 10:12:38
# Node ID 1de8abd9a4e1acfcf8375a0c5b9093a0474f95bf
# Parent e61a656b44bdbc030b9235b2a56a7084bbbf6729
emails: try to improve wording and layout - 1st iteration
diff --git a/rhodecode/model/comment.py b/rhodecode/model/comment.py
--- a/rhodecode/model/comment.py
+++ b/rhodecode/model/comment.py
@@ -91,7 +91,7 @@ class ChangesetCommentsModel(BaseModel):
{'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)
@@ -127,7 +127,7 @@ class ChangesetCommentsModel(BaseModel):
'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=
@@ -140,6 +140,7 @@ class ChangesetCommentsModel(BaseModel):
#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,
diff --git a/rhodecode/templates/email_templates/changeset_comment.html b/rhodecode/templates/email_templates/changeset_comment.html
--- a/rhodecode/templates/email_templates/changeset_comment.html
+++ b/rhodecode/templates/email_templates/changeset_comment.html
@@ -1,17 +1,18 @@
## -*- coding: utf-8 -*-
<%inherit file="main.html"/>
-##message from user goes here
-
-${cs_comment_user}:
+
+
${_('URL')}: ${cs_comment_url}
+
+${_('%s commented on a %s changeset.') % (cs_comment_user,cs_target_repo) |n}
+
+${_('Changeset')}: ${h.short_id(raw_id)}
+${_('Description')}:
+${h.shorter(message, 256)}
+
+
+%if status_change:
+ ${_('The changeset status was changed to')}: ${status_change}
+%endif
+${_('Comment')}:
${body}
-%if status_change:
- ${_('New status')} -> ${status_change}
-%endif
-${_('View this comment here')}: ${cs_comment_url}
-
-
-${_('Repo')}: ${cs_target_repo}
-${_('Changeset')}: ${h.short_id(raw_id)}
-${_('desc')}: ${h.shorter(message, 256)}
-
diff --git a/rhodecode/templates/email_templates/password_reset.html b/rhodecode/templates/email_templates/password_reset.html
--- a/rhodecode/templates/email_templates/password_reset.html
+++ b/rhodecode/templates/email_templates/password_reset.html
@@ -2,10 +2,9 @@
<%inherit file="main.html"/>
${_('Hello %s') % user}
-${_('We received a request to create a new password for your account.')}
-${_('You can generate it by clicking following URL')}:
+${_('We received a request to create a new password for your account.')}
+${_('You can generate it by clicking following URL')}:
${reset_url}
-
-${_("If you did not request new password please ignore this email.")}
+${_("Please ignore this email if you did not request a new password .")}
diff --git a/rhodecode/templates/email_templates/pull_request.html b/rhodecode/templates/email_templates/pull_request.html
--- a/rhodecode/templates/email_templates/pull_request.html
+++ b/rhodecode/templates/email_templates/pull_request.html
@@ -1,18 +1,19 @@
## -*- coding: utf-8 -*-
<%inherit file="main.html"/>
-${_('User %s opened pull request for repository %s and wants you to review changes.') % (('%s' % pr_user_created),pr_repo_url) |n}
-${_('View this pull request here')}: ${pr_url}
-${_('title')}: ${pr_title}
-${_('description')}:
-
-${body}
-
+${_('URL')}: ${pr_url}
+
+${_('%s opened a pull request for repository %s and wants you to review changes.') % (pr_user_created,pr_repo_url) |n}
-${_('revisions for reviewing')}
+${_('Title')}: ${pr_title}
+${_('Description')}:
+${body}
+
+${_('Changesets')}:
%for r,r_msg in pr_revisions:
${h.short_id(r)}:
${h.shorter(r_msg, 256)}
+
%endfor
diff --git a/rhodecode/templates/email_templates/pull_request_comment.html b/rhodecode/templates/email_templates/pull_request_comment.html
--- a/rhodecode/templates/email_templates/pull_request_comment.html
+++ b/rhodecode/templates/email_templates/pull_request_comment.html
@@ -1,18 +1,17 @@
## -*- coding: utf-8 -*-
<%inherit file="main.html"/>
-${_('Pull request #%s for repository %s') % (pr_id, pr_target_repo) |n}
-##message from user goes here
-
-${pr_comment_user}:
-${body}
-
-${_('View this comment here')}: ${pr_comment_url}
+
+${_('URL')}: ${pr_comment_url}
+
+${_('%s commented on pull request "%s"') % (pr_comment_user,pr_title) |n}
%if status_change:
%if closing_pr:
- ${_('Closing pull request with status')} -> ${status_change}
+ ${_('Pull request was closed with status')}: ${status_change}
%else:
- ${_('New status')} -> ${status_change}
+ ${_('Pull request changed status')}: ${status_change}
%endif
%endif
-