Revision c3d059f5

b/snf-astakos-app/astakos/im/messages.py
44 44
ACCOUNT_NOT_MODERATED = 'User account is not moderated.'
45 45
ACCOUNT_NOT_VERIFIED = 'User account does not have a verified email address.'
46 46
ACCOUNT_RESEND_ACTIVATION = (
47
    'It seems that an activation email has been sent to you, but you have '
48
    'not followed the activation link. '
49
    '<a href="%(send_activation_url)s">Resend activation email.</a>')
47
    'It seems that a verification email has been sent to you, but you have '
48
    'not followed the email verification link. '
49
    '<a href="%(send_activation_url)s">Resend verification email.</a>')
50 50
INACTIVE_ACCOUNT_CHANGE_EMAIL = ''.join(
51 51
    [ACCOUNT_RESEND_ACTIVATION,
52
     ' Or <a href="%(signup_url)s">Send activation to a new email.</a>'])
52
     ' Or <a href="%(signup_url)s">Send verification to a new email.</a>'])
53 53

  
54 54
ACCOUNT_PENDING_ACTIVATION_HELP = (
55
    'An activation email has been sent to you. Make sure you check your '
56
    'spam folder, too.')
55
    'A verification email has been sent to the email address you specified '
56
    'during sign up. Please follow the link in this email to proceed. '
57
    'Make sure you check your spam folder, too.')
57 58

  
58 59
ACCOUNT_ACTIVATED = 'Congratulations. Your account has' + \
59 60
    ' been activated. You are now logged in.'
......
66 67
    'can now login using your new password.')
67 68
PASSWORD_CHANGED = 'Your new password was set successfully.'
68 69

  
69
ACCOUNT_RESEND_ACTIVATION = 'Resend activation email'
70
ACCOUNT_USER_ACTIVATION_PENDING = 'You have not followed the activation link'
70
ACCOUNT_RESEND_ACTIVATION = 'Resend verification email'
71
ACCOUNT_USER_ACTIVATION_PENDING = 'You have not followed the verification link'
71 72

  
72 73
ACCOUNT_UNKNOWN = 'There is no such account.'
73 74
TOKEN_UNKNOWN = 'There is no user matching this authentication token.'
......
208 209
    'now pending approval. You will be notified by email in the next few '
209 210
    'days. Thanks for your interest!')
210 211
ACTIVATION_SENT = (
211
    'An email containing your activation link has been sent to your '
212
    'An email containing a verification link has been sent to your '
212 213
    'email address.')
213 214

  
214 215
REGISTRATION_COMPLETED = (
......
327 328
all pending registrations will be deleted.'''
328 329

  
329 330
AUTH_PROVIDER_PENDING_RESEND_ACTIVATION = (
330
    '<a href="{resend_activation_url}">Click here to resend activation '
331
    '<a href="{resend_activation_url}">Click here to resend the verification '
331 332
    'email.</a>')
332 333
AUTH_PROVIDER_PENDING_MODERATION = (
333 334
    'Your account request is pending moderation.')
334 335
AUTH_PROVIDER_PENDING_ACTIVATION = (
335
    'Your account request is pending activation.')
336
    'Your account request is pending email verification.')
336 337
AUTH_PROVIDER_ACCOUNT_INACTIVE = 'Your account is disabled.'
337 338

  
338 339
AUTH_PROVIDER_ADD_TO_EXISTING_ACCOUNT = (
......
344 345
INVITATION_EMAIL_SUBJECT = 'Invitation to %s' % _SITENAME
345 346
GREETING_EMAIL_SUBJECT = 'Welcome to %s' % _SITENAME
346 347
FEEDBACK_EMAIL_SUBJECT = 'Feedback from %s' % _SITENAME
347
VERIFICATION_EMAIL_SUBJECT = '%s account activation is needed' % _SITENAME
348
VERIFICATION_EMAIL_SUBJECT = '%s account verification' % _SITENAME
348 349
ACCOUNT_CREATION_SUBJECT = '%s account created (%%(user)s)' % _SITENAME
349 350
HELPDESK_NOTIFICATION_EMAIL_SUBJECT = \
350 351
    '%s account activated (%%(user)s)' % _SITENAME

Also available in: Unified diff