Revision 2131d88a

b/snf-astakos-app/astakos/im/api.py
124 124 
    index_url = absolute(reverse('astakos.im.views.index'))
125 125 
    if urlparse(location).query.rfind('next=') == -1:
126 126 
        index_url = '%s?next=%s' % (index_url, quote(location))
127 
    l = [{ 'url': index_url, 'name': "Signin"}]
127 
    l = [{ 'url': index_url, 'name': "Sign in"}]
128 128 
    if request.user.is_authenticated():
129 129 
        l = []
130 130 
        l.append({ 'url': absolute(reverse('astakos.im.views.edit_profile')),
131 131 
                  'name': request.user.email})
132 132 
        l.append({ 'url': absolute(reverse('astakos.im.views.edit_profile')),
133 
                  'name': "view your profile" })
133 
                  'name': "View your profile" })
134 134 
        if request.user.password:
135 135 
            l.append({ 'url': absolute(reverse('password_change')),
136 
                      'name': "change your password" })
136 
                      'name': "Change your password" })
137 137 
        if INVITATIONS_ENABLED:
138 138 
            l.append({ 'url': absolute(reverse('astakos.im.views.invite')),
139 
                      'name': "invite some friends" })
139 
                      'name': "Invite some friends" })
140 140 
        l.append({ 'url': absolute(reverse('astakos.im.views.send_feedback')),
141 
                  'name': "feedback" })
141 
                  'name': "Send feedback" })
142 142 
        l.append({ 'url': absolute(reverse('astakos.im.views.logout')),
143 
                  'name': "logout"})
143 
                  'name': "Sign out"})
144 144 

  		





  145
  145
  
    
    callback = request.GET.get('callback', None)


  		





  146
  146
  
    
    data = json.dumps(tuple(l))


  		












  

    
      b/snf-astakos-app/astakos/im/backends.py
    
  






  164
  164
  
    
                message = _('Registration completed. You can now login.')


  		





  165
  165
  
    
            else:


  		





  166
  166
  
    
                _send_notification(user, admin_email_template_name)


  		





  167
  
  
    
                message = _('Registration completed. You will receive an email upon your account\'s activation.')


  		





  
  167
  
    
                message = _('Your request for an account was successfully sent \


  		





  
  168
  
    
                            and pending approval from our administrators. You \


  		





  
  169
  
    
                            will be notified by email the next days. \


  		





  
  170
  
    
                            Thanks for being patient, the GRNET team')


  		





  168
  171
  
    
            status = messages.SUCCESS


  		





  169
  172
  
    
        except Invitation.DoesNotExist, e:


  		





  170
  173
  
    
            status = messages.ERROR


  		





  ......




  233
  236
  
    
        if MODERATION_ENABLED:


  		





  234
  237
  
    
            try:


  		





  235
  238
  
    
                _send_notification(user, admin_email_template_name)


  		





  236
  
  
    
                message = _('Registration completed. You will receive an email upon your account\'s activation.')


  		





  
  239
  
    
                message = _('Your request for an account was successfully sent \


  		





  
  240
  
    
                            and pending approval from our administrators. You \


  		





  
  241
  
    
                            will be notified by email the next days. \


  		





  
  242
  
    
                            Thanks for being patient, the GRNET team')


  		





  237
  243
  
    
            except (SMTPException, socket.error) as e:


  		





  238
  244
  
    
                status = messages.ERROR


  		





  239
  245
  
    
                name = 'strerror'


  		












Also available in:
  Unified diff