Revision 758fc8ec

b/snf-astakos-app/astakos/im/messages.py
33 33

  
34 34
from django.conf import settings
35 35

  
36
ACCOUNT_AUTHENTICATION_FAILED           =   'Authenticate with this account failed.'
36
ACCOUNT_AUTHENTICATION_FAILED           =   'Authentication with this account failed.'
37 37
ACCOUNT_ALREADY_ACTIVE                  =   'This account is already active.'
38 38
ACCOUNT_PENDING_ACTIVATION              =   'Your account request is pending activation.'
39 39
ACCOUNT_PENDING_MODERATION              =   'Your account request is pending moderation.'
......
44 44
ACCOUNT_PENDING_ACTIVATION_HELP         =   'An activation email has been sent to you. Make sure you check your spam folder, too.'
45 45

  
46 46
ACCOUNT_ACTIVATED                       =   'Congratulations. Your account has' + \
47
                                            ' been activated and you have been' + \
48
                                            ' automatically signed in.'
47
                                            ' been activated. You are now logged in.'
49 48
PASSWORD_RESET_DONE                     =   'An email with details on how to change your password has been sent. Please check your Inbox.'
50 49
PASSWORD_RESET_CONFIRM_DONE             =   'Your password has changed successfully. You can now login using your new password.'
51
PASSWORD_CHANGED                        =   'Your new password is set.'
50
PASSWORD_CHANGED                        =   'Your new password was set successfully.'
52 51

  
53 52
ACCOUNT_RESEND_ACTIVATION_PROMPT        =   'Resend activation email'
54 53
ACCOUNT_USER_ACTIVATION_PENDING         =   'You have not followed the activation link'
55 54

  
56 55
ACCOUNT_UNKNOWN                         =   'It seems there is no account with those .'
57
TOKEN_UNKNOWN                           =   'There is no user matching this token.'
58
TOKEN_UPDATED                           =   'Your ~okeanos account token was updated.'
56
TOKEN_UNKNOWN                           =   'There is no user matching this authentication token.'
57
TOKEN_UPDATED                           =   'Your authentication token has been updated successfully.'
59 58

  
60 59
PROFILE_UPDATED                         =   'Your profile has been updated successfully.'
61
FEEDBACK_SENT                           =   'Thank you for your feedback. We will process it carefully.'
60
FEEDBACK_SENT                           =   'Thank you for contacting us. We will process your message carefully and get back to you.'
62 61
EMAIL_CHANGED                           =   'The email of your account changed successfully.'
63
EMAIL_CHANGE_REGISTERED                 =   'Your request for changing your email has been registered succefully. \
64
                                               A verification email at your new address is going to be sent.'
62
EMAIL_CHANGE_REGISTERED                 =   'Your request for changing your email has been registered successfully. \
63
                                               A verification email will be sent to your new address.'
65 64

  
66 65
OBJECT_CREATED                          =   'The %(verbose_name)s was created successfully.'
67 66
USER_JOINED_GROUP                       =   'User %(realname)s joined the project.'
......
69 68
USER_MEMBERSHIP_REJECTED                =   'User\'s %(realname)s request to join the project has been rejected.'
70 69
MEMBER_REMOVED                          =   'User %(realname)s has been successfully removed from the project.'
71 70
BILLING_ERROR                           =   'Service response status: %(status)d'
72
LOGOUT_SUCCESS                          =   'Logged out from ~okeanos.'
73
LOGIN_SUCCESS                           =   'You are logged in to ~okeanos with your %s account.'
74
LOCAL_LOGIN_SUCCESS                     =   'You are logged in to your ~okeanos account.'
71
LOGOUT_SUCCESS                          =   'Logged out successfully.'
72
LOGIN_SUCCESS                           =   'Logged in successfully, using %s.'
73
LOCAL_LOGIN_SUCCESS                     =   'Logged in successfully, using your local account.'
75 74

  
76 75
GENERIC_ERROR                           =   'Hmm... It seems something bad has happened, and we don\'t know the details right now. \
77 76
                                               Please contact the administrators by email for more details.'
......
81 80
PROJECT_MAX_PARTICIPANT_NUMBER_REACHED  =   'This Project reached its maximum number of members. No other member can be added.'
82 81
NO_APPROVAL_TERMS                       =   'There are no terms of service to approve.'
83 82
PENDING_EMAIL_CHANGE_REQUEST            =   'It seems there is already a pending request for an email change. ' + \
84
                                            'Submiting a new request to change your email will cancel all previous requests.'
83
                                            'Submitting a new request to change your email will cancel all previous requests.'
85 84
OBJECT_CREATED_FAILED                   =   'The %(verbose_name)s creation failed: %(reason)s.'
86 85
GROUP_JOIN_FAILURE                      =   'Failed to join this Group.'
87 86
PROJECT_JOIN_FAILURE                    =   'Failed to join this Project.'
......
97 96
SHIBBOLETH_INACTIVE_ACC                 =   'This email is already associated with an account that is not yet activated. \
98 97
                                               If that is your account, you need to activate it before being able to \
99 98
                                               associate it with this shibboleth account.'
100
SHIBBOLETH_MISSING_EPPN = 'Your request is missing a unique ' + \
101
                          'token. This means your academic ' + \
102
                          'institution does not yet allow its users to log ' + \
103
                          'into %(domain)s with their academic ' + \
104
                          'credentials. Please contact %(contact_email)s' + \
105
                          ' for more information.'
99
SHIBBOLETH_MISSING_EPPN                 =   'Your request is missing a unique ' + \
100
                                            'token. This means your academic ' + \
101
                                            'institution does not yet allow its users to log ' + \
102
                                            'into %(domain)s with their academic ' + \
103
                                            'credentials. Please contact %(contact_email)s' + \
104
                                            ' for more information.'
106 105
SHIBBOLETH_MISSING_NAME                 =   'This request is missing the user name.'
107 106

  
108 107
SIGN_TERMS                              =   'Please, you need to \'Agree with the terms\' before proceeding.'
109 108
CAPTCHA_VALIDATION_ERR                  =   'You have not entered the correct words. Please try again.'
110
SUSPENDED_LOCAL_ACC                     =   'You can not login with your local credentials. This account does not have a local password. \
109
SUSPENDED_LOCAL_ACC                     =   'This account does not have a local password. \
111 110
                                               Please try logging in using an external login provider (e.g.: twitter)'
112 111
UNUSABLE_PASSWORD                       =   'You can not use a local password for this account. Only external login providers are enabled.'
113 112
EMAIL_UNKNOWN                           =   'This email address doesn\'t have an associated user account. \
114 113
                                               Please make sure you have registered, before proceeding.'
115
INVITATION_EMAIL_EXISTS                 =   'There is already invitation for this email.'
114
INVITATION_EMAIL_EXISTS                 =   'An invitation has already been sent to this email.'
116 115
INVITATION_CONSUMED_ERR                 =   'Invitation is used.'
117 116
UNKNOWN_USERS                           =   'Unknown users: %s'
118 117
UNIQUE_EMAIL_IS_ACTIVE_CONSTRAIN_ERR    =   'More than one account with the same email & \'is_active\' field. Error.'
......
128 127
ADD_GROUP_MEMBERS_Q_HELP                =   'Add a comma separated list of user emails, eg. user1@user.com, user2@user.com'
129 128
ASTAKOSUSER_GROUPS_HELP                 =   'In addition to the permissions assigned manually, \
130 129
                                               this user will also get all permissions coming from his/her groups.'
131
EMAIL_CHANGE_NEW_ADDR_HELP              =   'Your old email address will be used, until you verify your new one.'
130
EMAIL_CHANGE_NEW_ADDR_HELP              =   'Provide a new email address. Until you verify the new address by \
131
                                               following the activation link that will be sent to it, your old \
132
                                               email address will remain active.'
132 133

  
133 134
EMAIL_SEND_ERR                          =   'Failed to send %s.'
134 135
ADMIN_NOTIFICATION_SEND_ERR             =   EMAIL_SEND_ERR % 'admin notification'
......
173 174
NOT_MEMBERSHIP_REQUEST                  =   'This is not a valid membership request.'
174 175
NOT_ACCEPTED_MEMBERSHIP                 =   'This is not an accepted membership.'
175 176
MEMBERSHIP_REQUEST_EXISTS               =   'The membership request already exists.'
176
NO_APPLICANT                            =   'Project application requires an applicant. None found.'
177
INVALID_PROJECT_START_DATE              =   'Project start date should be equal or greater than the current date'
178
INVALID_PROJECT_END_DATE                =   'Project end date should be equal or greater than than the current date'
179
INCONSISTENT_PROJECT_DATES              =   'Project end date should be greater than the project start date'
177
NO_APPLICANT                            =   'Project application requires at least one applicant. None found.'
178
INVALID_PROJECT_START_DATE              =   'Project start date should be equal or greater than the current date.'
179
INVALID_PROJECT_END_DATE                =   'Project end date should be equal or greater than than the current date.'
180
INCONSISTENT_PROJECT_DATES              =   'Project end date should be greater than the project start date.'
180 181
ADD_PROJECT_MEMBERS_Q_HELP              =   'Add a comma separated list of user emails, eg. user1@user.com, user2@user.com'
181 182
MISSING_IDENTIFIER                      =   'Missing identifier.'
182 183
UNKNOWN_USER_ID                         =   'There is no user identified by %s.'
......
186 187
PENDING_MEMBERSHIP_LEAVE                =   'Your request is pending moderation by the Project owner.'
187 188
USER_JOINED_PROJECT                     =   '%(realname)s has joined the Project.'
188 189
USER_LEFT_PROJECT                       =   '%(realname)s has left the Project.'
189
USER_JOIN_REQUEST_SUBMITED              =   'Join request submitted.'
190
USER_JOIN_REQUEST_SUBMITED              =   'Your request to join the project has been submitted successfully.'
190 191

  
191 192
APPLICATION_CANNOT_APPROVE              =   "Cannot approve application %s in state '%s'"
192 193
APPLICATION_CANNOT_DENY                 =   "Cannot deny application %s in state '%s'"
......
197 198
AUTH_PROVIDER_NOT_ACTIVE                     =   "'%(provider)s' is disabled."
198 199
AUTH_PROVIDER_NOT_ACTIVE_FOR_LOGIN           =   "Login using '%(provider)s' is disabled."
199 200
AUTH_PROVIDER_NOT_ACTIVE_FOR_USER            =   "You cannot login using '%(provider)s'."
200
AUTH_PROVIDER_NOT_ACTIVE_FOR_CREATE          =   "Signup using '%(provider)s' is disabled."
201
AUTH_PROVIDER_NOT_ACTIVE_FOR_CREATE          =   "Sign up using '%(provider)s' is disabled."
201 202
AUTH_PROVIDER_NOT_ACTIVE_FOR_ADD             =   "You cannot add %(provider)s login method."
202
AUTH_PROVIDER_ADDED                          =   "New login method added."
203
AUTH_PROVIDER_ADDED                          =   "New login method added successfully."
203 204
AUTH_PROVIDER_ADD_FAILED                     =   "Failed to add new login method."
204
AUTH_PROVIDER_ADD_EXISTS                     =   "Account already assigned to another user."
205
AUTH_PROVIDER_ADD_EXISTS                     =   "It seems that this account is already assigned to another user."
205 206
AUTH_PROVIDER_LOGIN_TO_ADD                   =   "The new login method will be assigned once you login to your account."
206 207
AUTH_PROVIDER_INVALID_LOGIN                  =   "No account exists."
207 208
AUTH_PROVIDER_REQUIRED                       =   "%(provider)s login method is required. Add one from your profile page."

Also available in: Unified diff