Revision 47c2fb43

b/snf-astakos-app/astakos/im/auth_providers.py
206 206
    module = 'local'
207 207
    title = _('Local password')
208 208
    description = _('Create a local password for your account')
209
    add_prompt =  _('Allows you to login using a local password')
210
    details_tpl = _('Local account: %(username)s')
209
    add_prompt =  _('Enable Classic login for your account')
210
    details_tpl = _('Username: %(username)s')
211 211
    login_prompt = _('Classic login (username/password)')
212 212
    signup_prompt = _('New to ~okeanos ?')
213 213
    signup_link_prompt = _('create an account now')
......
229 229
class ShibbolethAuthProvider(AuthProvider):
230 230
    module = 'shibboleth'
231 231
    title = _('Academic account')
232
    add_prompt = _('Allows you to login using an academic account')
233
    details_tpl = _('Academic account: %(identifier)s')
232
    add_prompt = _('Enable Academic login for your account')
233
    details_tpl = _('Identifier: %(identifier)s')
234 234
    user_title = _('Academic account (%(identifier)s)')
235 235
    primary_login_prompt = _('If you are a student, professor or researcher you '
236 236
                             'can login using your academic account.')
......
238 238

  
239 239
    login_template = 'im/auth/shibboleth_login.html'
240 240
    login_prompt_template = 'im/auth/third_party_provider_generic_login_prompt.html'
241
    logout_from_provider_text = ' at your Academic account (shibboleth)'
241
    logout_from_provider_text = 'Please close all browser windows to complete logout from your Academic account, too.'
242 242

  
243 243
    method_prompt = _('Academic account')
244 244

  
......
246 246
class TwitterAuthProvider(AuthProvider):
247 247
    module = 'twitter'
248 248
    title = _('Twitter')
249
    add_prompt = _('Allows you to login using a Twitter account')
250
    details_tpl = _('Twitter account: %(info_screen_name)s')
249
    add_prompt = _('Enable Twitter login for your account')
250
    details_tpl = _('Username: %(info_screen_name)s')
251 251
    user_title = _('Twitter (%(info_screen_name)s)')
252 252
    login_view = 'astakos.im.target.twitter.login'
253 253

  
......
258 258
class GoogleAuthProvider(AuthProvider):
259 259
    module = 'google'
260 260
    title = _('Google')
261
    add_prompt = _('Allows you to login using a Google account')
262
    details_tpl = _('Google account: %(info_email)s')
261
    add_prompt = _('Enable Google login for your account')
262
    details_tpl = _('Email: %(info_email)s')
263 263
    user_title = _('Google (%(info_email)s)')
264 264
    login_view = 'astakos.im.target.google.login'
265 265

  
......
270 270
class LinkedInAuthProvider(AuthProvider):
271 271
    module = 'linkedin'
272 272
    title = _('LinkedIn')
273
    add_prompt = _('Allows you to login using a LinkedIn account')
274
    details_tpl = _('LinkedIn account: %(info_emailAddress)s')
273
    add_prompt = _('Enable LinkedIn login for your account')
274
    details_tpl = _('Email: %(info_emailAddress)s')
275 275
    user_title = _('LinkedIn (%(info_emailAddress)s)')
276 276
    login_view = 'astakos.im.target.linkedin.login'
277 277

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

  
92 92
# Field validation fields
93 93
REQUIRED_FIELD                          =   'This field is required.'
94
EMAIL_USED                              =   'The email address you provided is already in use. Please provide a different email address.'
94
EMAIL_USED                              =   'There is already an account with this email address.'
95 95
SHIBBOLETH_EMAIL_USED                   =   'This email is already associated with another shibboleth account.'
96 96
SHIBBOLETH_INACTIVE_ACC                 =   'This email is already associated with an account that is not yet activated. \
97 97
                                               If that is your account, you need to activate it before being able to \
......
212 212
AUTH_PROVIDER_CANNOT_CHANGE_PASSWORD         =   "Changing password is not supported."
213 213
AUTH_PROVIDER_SIGNUP_FROM_LOGIN              =   None
214 214

  
215
EXISTING_EMAIL_THIRD_PARTY_NOTIFICATION      =   "You can add '%s' login method to your existing account from your " \
215
EXISTING_EMAIL_THIRD_PARTY_NOTIFICATION      =   "You can add the '%s' login method to your existing account from your " \
216 216
                                                 " <a href='%s'>profile page</a>"
217 217

  
218 218
messages = locals().keys()

Also available in: Unified diff