Update messages

[astakos] / snf-astakos-app / astakos / im / messages.py

diff --git a/snf-astakos-app/astakos/im/messages.py b/snf-astakos-app/astakos/im/messages.py
index d2512b9..3872b2d 100644 (file)
--- a/snf-astakos-app/astakos/im/messages.py
+++ b/snf-astakos-app/astakos/im/messages.py
@@ -41,6 +41,12 @@ INACTIVE_ACCOUNT_CHANGE_EMAIL           =   ''.join([ACCOUNT_RESEND_ACTIVATION,
 
 ACCOUNT_PENDING_ACTIVATION_HELP         =   'If you haven\'t received activation email, be sure to check your spam folder.'
 
+ACCOUNT_ACTIVATED                       =   'Congratulations. Your account has' + \
+                                            ' been activated and you have been' + \
+                                            ' automatically signed in to your account.'
+PASSWORD_RESET_DONE                     =   'A mail with details on how to change your password was sent.'
+PASSWORD_RESET_CONFIRM_DONE             =   'Password changed. You can now login using your new password.'
+
 ACCOUNT_RESEND_ACTIVATION_PROMPT        =   'Resend activation mail'
 ACCOUNT_USER_ACTIVATION_PENDING         =   'You have not followed the activation link'
 
@@ -58,6 +64,7 @@ MEMBER_JOINED_GROUP                     =   '%(realname)s has been successfully
 MEMBER_REMOVED                          =   '%(realname)s has been successfully removed from the group.'
 BILLING_ERROR                           =   'Service response status: %(status)d'
 LOGOUT_SUCCESS                          =   'You have successfully logged out.'
+LOGIN_SUCCESS                           =   'You have successfully logged in.'
 
 GENERIC_ERROR                           =   'Something wrong has happened. \
                                                Please contact the administrators for more details.'
@@ -118,16 +125,16 @@ NOTIFICATION_SEND_ERR                   =   EMAIL_SEND_ERR % 'notification'
 MISSING_NEXT_PARAMETER                  =   'No next parameter'
 
 INVITATION_SENT                         =   'Invitation sent to %(email)s.'
-VERIFICATION_SENT                       =   'Verification sent.'
+VERIFICATION_SENT                       =   'Registration completed but account is not active yet. Account activation link was sent to your email address.'
 SWITCH_ACCOUNT_LINK_SENT                =   'This email is already associated with another local account. \
                                                To change this account to a shibboleth one follow the link in the verification email sent to %(email)s. \
                                                Otherwise just ignore it.'
 NOTIFICATION_SENT                       =   'Your request for an account was successfully received and is now pending approval. \
                                                You will be notified by email in the next few days. \
                                                Thanks for your interest in ~okeanos! The GRNET team.'
-ACTIVATION_SENT                         =   'Activation sent.'
+ACTIVATION_SENT                         =   'An email containing your activation link was sent to your email address.'
 
-REGISTRATION_COMPLETED                  =   'Registration completed. You can now login.'
+REGISTRATION_COMPLETED                  =   'Registration completed you can now login to your account.'
 
 NO_RESPONSE                             =   'There is no response.'
 NOT_ALLOWED_NEXT_PARAM                  =   'Not allowed next parameter.'
@@ -140,7 +147,9 @@ AUTH_PROVIDER_NOT_ACTIVE                     =   "'%(provider)s' is disabled"
 AUTH_PROVIDER_NOT_ACTIVE_FOR_LOGIN           =   "Login using '%(provider)s' is disabled"
 AUTH_PROVIDER_NOT_ACTIVE_FOR_USER_LOGIN      =   "You cannot login using '%(provider)s'"
 AUTH_PROVIDER_NOT_ACTIVE_FOR_CREATE          =   "Signup using '%(provider)s' is disabled"
-AUTH_PROVIDER_NOT_ACTIVE_FOR_ADD             =   "'%(provider)s is disabled"
-AUTH_PROVIDER_ADDED                          =   "Your new login method has been added"
-AUTH_PROVIDER_ADD_FAILED                     =   "Failed to add new login method"
+AUTH_PROVIDER_NOT_ACTIVE_FOR_ADD             =   "'%(provider)s is disabled."
+AUTH_PROVIDER_ADDED                          =   "New login method added."
+AUTH_PROVIDER_ADD_FAILED                     =   "Failed to add new login method."
+AUTH_PROVIDER_ADD_EXISTS                     =   "Account already assigned to another user."
+AUTH_PROVIDER_LOGIN_TO_ADD                   =   "Please login now to your existing account."