Commit 6e61d731 authored by Yiannis Tsiouris's avatar Yiannis Tsiouris

Merge branch 'feature-rephrase-emails' into develop

parents 22da17df 85fcf32f
......@@ -333,7 +333,7 @@ AUTH_PROVIDER_ADD_TO_EXISTING_ACCOUNT = (
# Email subjects
_SITENAME = branding_settings.SERVICE_NAME
PLAIN_EMAIL_SUBJECT = 'New email from %s' % _SITENAME
PLAIN_EMAIL_SUBJECT = 'New e-mail from %s' % _SITENAME
INVITATION_EMAIL_SUBJECT = 'Invitation to %s' % _SITENAME
GREETING_EMAIL_SUBJECT = 'Welcome to %s' % _SITENAME
FEEDBACK_EMAIL_SUBJECT = 'Feedback from %s' % _SITENAME
......@@ -341,8 +341,8 @@ VERIFICATION_EMAIL_SUBJECT = '%s account verification' % _SITENAME
ACCOUNT_CREATION_SUBJECT = '%s account created (%%(user)s)' % _SITENAME
HELPDESK_NOTIFICATION_EMAIL_SUBJECT = \
'%s account activated (%%(user)s)' % _SITENAME
EMAIL_CHANGE_EMAIL_SUBJECT = 'Email change on %s ' % _SITENAME
PASSWORD_RESET_EMAIL_SUBJECT = 'Password reset on %s ' % _SITENAME
EMAIL_CHANGE_EMAIL_SUBJECT = '%s e-mail change notification' % _SITENAME
PASSWORD_RESET_EMAIL_SUBJECT = 'Password reset on %s' % _SITENAME
PROJECT_CREATION_SUBJECT = \
'%s application for a new project created (%%s)' % _SITENAME
PROJECT_MODIFICATION_SUBJECT = \
......
......@@ -41,7 +41,7 @@ def membership_change_notify(project, user, action):
[user.email],
MEM_CHANGE_NOTIF['subject'] % project.__dict__,
template=MEM_CHANGE_NOTIF['template'],
dictionary={'object': project, 'action': action})
dictionary={'object': project, 'action': action, 'user': user})
notification.send()
except NotificationError, e:
logger.error(e.message)
......@@ -54,7 +54,7 @@ def membership_enroll_notify(project, user):
[user.email],
MEM_ENROLL_NOTIF['subject'] % project.__dict__,
template=MEM_ENROLL_NOTIF['template'],
dictionary={'object': project})
dictionary={'object': project, 'user': user})
notification.send()
except NotificationError, e:
logger.error(e.message)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment