Revision 1fcf4a99 snf-astakos-app/astakos/im/functions.py
b/snf-astakos-app/astakos/im/functions.py | ||
---|---|---|
50 | 50 |
from functools import wraps |
51 | 51 |
|
52 | 52 |
from astakos.im.settings import DEFAULT_CONTACT_EMAIL, DEFAULT_FROM_EMAIL, \ |
53 |
SITENAME, BASEURL, DEFAULT_ADMIN_EMAIL, LOGGING_LEVEL |
|
53 |
SITENAME, BASEURL, DEFAULT_ADMIN_EMAIL, LOGGING_LEVEL, \ |
|
54 |
VERIFICATION_EMAIL_SUBJECT, ADMIN_NOTIFICATION_EMAIL_SUBJECT, \ |
|
55 |
HELPDESK_NOTIFICATION_EMAIL_SUBJECT, INVITATION_EMAIL_SUBJECT, \ |
|
56 |
GREETING_EMAIL_SUBJECT, FEEDBACK_EMAIL_SUBJECT, EMAIL_CHANGE_EMAIL_SUBJECT |
|
54 | 57 |
from astakos.im.models import Invitation, AstakosUser |
55 | 58 |
|
56 | 59 |
logger = logging.getLogger(__name__) |
... | ... | |
92 | 95 |
'support': DEFAULT_CONTACT_EMAIL}) |
93 | 96 |
sender = DEFAULT_FROM_EMAIL |
94 | 97 |
try: |
95 |
send_mail('%s alpha2 testing account activation is needed' % SITENAME, message, sender, [user.email])
|
|
98 |
send_mail(_(VERIFICATION_EMAIL_SUBJECT), message, sender, [user.email])
|
|
96 | 99 |
except (SMTPException, socket.error) as e: |
97 | 100 |
logger.exception(e) |
98 | 101 |
raise SendVerificationError() |
... | ... | |
120 | 123 |
'support': DEFAULT_CONTACT_EMAIL}) |
121 | 124 |
sender = DEFAULT_FROM_EMAIL |
122 | 125 |
try: |
123 |
send_mail('%s alpha2 testing account notification' % SITENAME, message, sender, [DEFAULT_ADMIN_EMAIL])
|
|
126 |
send_mail(_(ADMIN_NOTIFICATION_EMAIL_SUBJECT), message, sender, [DEFAULT_ADMIN_EMAIL])
|
|
124 | 127 |
except (SMTPException, socket.error) as e: |
125 | 128 |
logger.exception(e) |
126 | 129 |
raise SendNotificationError() |
... | ... | |
143 | 146 |
'support': DEFAULT_ADMIN_EMAIL}) |
144 | 147 |
sender = DEFAULT_FROM_EMAIL |
145 | 148 |
try: |
146 |
send_mail('%s alpha2 testing account notification' % SITENAME, message, sender, [DEFAULT_CONTACT_EMAIL])
|
|
149 |
send_mail(_(HELPDESK_NOTIFICATION_EMAIL_SUBJECT), message, sender, [DEFAULT_CONTACT_EMAIL])
|
|
147 | 150 |
except (SMTPException, socket.error) as e: |
148 | 151 |
logger.exception(e) |
149 | 152 |
raise SendNotificationError() |
... | ... | |
157 | 160 |
|
158 | 161 |
Raises SendInvitationError |
159 | 162 |
""" |
160 |
subject = _('Invitation to %s alpha2 testing' % SITENAME)
|
|
163 |
subject = _(INVITATION_EMAIL_SUBJECT)
|
|
161 | 164 |
url = '%s?code=%d' % (urljoin(BASEURL, reverse('astakos.im.views.index')), invitation.code) |
162 | 165 |
message = render_to_string('im/invitation.txt', { |
163 | 166 |
'invitation': invitation, |
... | ... | |
181 | 184 |
|
182 | 185 |
Raises SMTPException, socket.error |
183 | 186 |
""" |
184 |
subject = _('Welcome to %s alpha2 testing' % SITENAME)
|
|
187 |
subject = _(GREETING_EMAIL_SUBJECT)
|
|
185 | 188 |
message = render_to_string(email_template_name, { |
186 | 189 |
'user': user, |
187 | 190 |
'url': urljoin(BASEURL, reverse('astakos.im.views.index')), |
... | ... | |
199 | 202 |
logger._log(LOGGING_LEVEL, msg, []) |
200 | 203 |
|
201 | 204 |
def send_feedback(msg, data, user, email_template_name='im/feedback_mail.txt'): |
202 |
subject = _("Feedback from %s alpha2 testing" % SITENAME)
|
|
205 |
subject = _(FEEDBACK_EMAIL_SUBJECT)
|
|
203 | 206 |
from_email = user.email |
204 | 207 |
recipient_list = [DEFAULT_CONTACT_EMAIL] |
205 | 208 |
content = render_to_string(email_template_name, { |
... | ... | |
223 | 226 |
t = loader.get_template(email_template_name) |
224 | 227 |
c = {'url': url, 'site_name': SITENAME} |
225 | 228 |
from_email = DEFAULT_FROM_EMAIL |
226 |
send_mail(_("Email change on %s alpha2 testing") % SITENAME,
|
|
229 |
send_mail(_(EMAIL_CHANGE_EMAIL_SUBJECT),
|
|
227 | 230 |
t.render(Context(c)), from_email, [ec.new_email_address]) |
228 | 231 |
except (SMTPException, socket.error) as e: |
229 | 232 |
logger.exception(e) |
Also available in: Unified diff