Commit 2131d88a authored by Sofia Papagiannaki's avatar Sofia Papagiannaki
Browse files

Refs: #2141

Refs: #2146
parent 118311ad
......@@ -124,23 +124,23 @@ def get_menu(request):
index_url = absolute(reverse('astakos.im.views.index'))
if urlparse(location).query.rfind('next=') == -1:
index_url = '%s?next=%s' % (index_url, quote(location))
l = [{ 'url': index_url, 'name': "Signin"}]
l = [{ 'url': index_url, 'name': "Sign in"}]
if request.user.is_authenticated():
l = []
l.append({ 'url': absolute(reverse('astakos.im.views.edit_profile')),
'name': request.user.email})
l.append({ 'url': absolute(reverse('astakos.im.views.edit_profile')),
'name': "view your profile" })
'name': "View your profile" })
if request.user.password:
l.append({ 'url': absolute(reverse('password_change')),
'name': "change your password" })
'name': "Change your password" })
if INVITATIONS_ENABLED:
l.append({ 'url': absolute(reverse('astakos.im.views.invite')),
'name': "invite some friends" })
'name': "Invite some friends" })
l.append({ 'url': absolute(reverse('astakos.im.views.send_feedback')),
'name': "feedback" })
'name': "Send feedback" })
l.append({ 'url': absolute(reverse('astakos.im.views.logout')),
'name': "logout"})
'name': "Sign out"})
callback = request.GET.get('callback', None)
data = json.dumps(tuple(l))
......
......@@ -164,7 +164,10 @@ class InvitationsBackend(object):
message = _('Registration completed. You can now login.')
else:
_send_notification(user, admin_email_template_name)
message = _('Registration completed. You will receive an email upon your account\'s activation.')
message = _('Your request for an account was successfully sent \
and pending approval from our administrators. You \
will be notified by email the next days. \
Thanks for being patient, the GRNET team')
status = messages.SUCCESS
except Invitation.DoesNotExist, e:
status = messages.ERROR
......@@ -233,7 +236,10 @@ class SimpleBackend(object):
if MODERATION_ENABLED:
try:
_send_notification(user, admin_email_template_name)
message = _('Registration completed. You will receive an email upon your account\'s activation.')
message = _('Your request for an account was successfully sent \
and pending approval from our administrators. You \
will be notified by email the next days. \
Thanks for being patient, the GRNET team')
except (SMTPException, socket.error) as e:
status = messages.ERROR
name = 'strerror'
......
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