Revision cfb7dd4f snf-astakos-app/astakos/im/functions.py
b/snf-astakos-app/astakos/im/functions.py | ||
---|---|---|
89 | 89 |
'site_name': settings.SITENAME, |
90 | 90 |
'support': settings.CONTACT_EMAIL}) |
91 | 91 |
sender = settings.SERVER_EMAIL |
92 |
send_mail(_(settings.VERIFICATION_EMAIL_SUBJECT), message, sender, [user.email], |
|
92 |
send_mail(_(astakos_messages.VERIFICATION_EMAIL_SUBJECT), message, sender, |
|
93 |
[user.email], |
|
93 | 94 |
connection=get_connection()) |
94 | 95 |
logger.info("Sent user verirfication email: %s", user.log_display) |
95 | 96 |
|
... | ... | |
130 | 131 |
Notify admins that a new user has verified his email address and moderation |
131 | 132 |
step is required to activate his account. |
132 | 133 |
""" |
133 |
subject = _(settings.ACCOUNT_CREATION_SUBJECT) % {'user': user.email} |
|
134 |
subject = (_(astakos_messages.ACCOUNT_CREATION_SUBJECT) % |
|
135 |
{'user': user.email}) |
|
134 | 136 |
return _send_admin_notification(template_name, {}, subject=subject, |
135 | 137 |
user=user, msg="account creation") |
136 | 138 |
|
... | ... | |
149 | 151 |
sender = settings.SERVER_EMAIL |
150 | 152 |
recipient_list = [e[1] for e in settings.HELPDESK + |
151 | 153 |
settings.MANAGERS + settings.ADMINS] |
152 |
send_mail(_(settings.HELPDESK_NOTIFICATION_EMAIL_SUBJECT) % {'user': user.email}, |
|
154 |
send_mail(_(astakos_messages.HELPDESK_NOTIFICATION_EMAIL_SUBJECT) % |
|
155 |
{'user': user.email}, |
|
153 | 156 |
message, sender, recipient_list, connection=get_connection()) |
154 | 157 |
msg = 'Sent helpdesk admin notification for %s' % user.email |
155 | 158 |
logger.log(settings.LOGGING_LEVEL, msg) |
... | ... | |
159 | 162 |
""" |
160 | 163 |
Send invitation email. |
161 | 164 |
""" |
162 |
subject = _(settings.INVITATION_EMAIL_SUBJECT)
|
|
165 |
subject = _(astakos_messages.INVITATION_EMAIL_SUBJECT)
|
|
163 | 166 |
url = '%s?code=%d' % (join_urls(settings.BASEURL, reverse('index')), invitation.code) |
164 | 167 |
message = render_to_string(template_name, { |
165 | 168 |
'invitation': invitation, |
... | ... | |
183 | 186 |
|
184 | 187 |
Raises SMTPException, socket.error |
185 | 188 |
""" |
186 |
subject = _(settings.GREETING_EMAIL_SUBJECT)
|
|
189 |
subject = _(astakos_messages.GREETING_EMAIL_SUBJECT)
|
|
187 | 190 |
message = render_to_string(email_template_name, { |
188 | 191 |
'user': user, |
189 | 192 |
'url': join_urls(settings.BASEURL, reverse('index')), |
... | ... | |
198 | 201 |
|
199 | 202 |
|
200 | 203 |
def send_feedback(msg, data, user, email_template_name='im/feedback_mail.txt'): |
201 |
subject = _(settings.FEEDBACK_EMAIL_SUBJECT)
|
|
204 |
subject = _(astakos_messages.FEEDBACK_EMAIL_SUBJECT)
|
|
202 | 205 |
from_email = settings.SERVER_EMAIL |
203 | 206 |
recipient_list = [e[1] for e in settings.HELPDESK] |
204 | 207 |
content = render_to_string(email_template_name, { |
... | ... | |
219 | 222 |
'ec': ec} |
220 | 223 |
message = render_to_string(email_template_name, c) |
221 | 224 |
from_email = settings.SERVER_EMAIL |
222 |
send_mail(_(settings.EMAIL_CHANGE_EMAIL_SUBJECT), message, from_email, |
|
225 |
send_mail(_(astakos_messages.EMAIL_CHANGE_EMAIL_SUBJECT), message, |
|
226 |
from_email, |
|
223 | 227 |
[ec.new_email_address], connection=get_connection()) |
224 | 228 |
msg = 'Sent change email for %s' % ec.user.log_display |
225 | 229 |
logger.log(settings.LOGGING_LEVEL, msg) |
Also available in: Unified diff