Revision 9c73d218 snf-astakos-app/astakos/im/auth_providers.py

b/snf-astakos-app/astakos/im/auth_providers.py
80 80
    login_prompt = _('Login using ')
81 81
    primary_login_prompt = _('Login using ')
82 82
    login_message = None
83
    logout_message = 'You may still be logged in at "%(provider)s". Consider logging out.'
83
    logout_message = 'You may still be logged in %(provider)s though. Consider logging out from there too.'
84 84
    remote_authenticate = True
85 85
    remote_logout_url = None
86
    logout_from_provider_text = None
86 87

  
87 88
    def get_message(self, msg, **kwargs):
88 89
        params = kwargs
......
111 112

  
112 113
        self.login_message = self.login_message or self.get_title_display
113 114
        if self.logout_message and "%" in self.logout_message:
115
            logout_text_display = self.logout_from_provider_text or 'at %s' % self.get_title_display
114 116
            self.logout_message = self.logout_message % {'provider':
115
                                                         self.get_login_message_display}
117
                                                         logout_text_display}
116 118
        else:
117 119
            self.logout_message = self.logout_message or ''
118 120

  
......
193 195

  
194 196
class ShibbolethAuthProvider(AuthProvider):
195 197
    module = 'shibboleth'
196
    title = _('Academic credentials (Shibboleth)')
198
    title = _('Academic account (Shibboleth)')
197 199
    add_prompt = _('Allows you to login to your account using your academic '
198 200
                    'account')
199 201
    details_tpl = _('Shibboleth account \'%(identifier)s\' is connected to your '
......
206 208

  
207 209
    login_template = 'im/auth/shibboleth_login.html'
208 210
    login_prompt_template = 'im/auth/third_party_provider_generic_login_prompt.html'
211
    logout_from_provider_text = ' at your Academic account (shibboleth)'
209 212

  
210 213

  
211 214
class TwitterAuthProvider(AuthProvider):

Also available in: Unified diff