restore enhanced login instructions, lost in gettext() switchover
darcs-hash:20080713151004-84dde-6818a5392e8d78e6672399dfbc183b571751953a.gz
This commit is contained in:
parent
a55044ac03
commit
6ec4f035bd
@ -109,11 +109,22 @@ class LoginAction extends Action {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function get_instructions() {
|
function get_instructions() {
|
||||||
|
if (common_logged_in() &&
|
||||||
|
!common_is_real_login() &&
|
||||||
|
common_get_returnto())
|
||||||
|
{
|
||||||
|
# rememberme logins have to reauthenticate before
|
||||||
|
# changing any profile settings (cookie-stealing protection)
|
||||||
|
return _('For security reasons, please re-enter your ' .
|
||||||
|
'user name and password ' .
|
||||||
|
'before changing your settings.');
|
||||||
|
} else {
|
||||||
return _('Login with your username and password. ' .
|
return _('Login with your username and password. ' .
|
||||||
'Don\'t have a username yet? ' .
|
'Don\'t have a username yet? ' .
|
||||||
'[Register](%%action.register%%) a new account, or ' .
|
'[Register](%%action.register%%) a new account, or ' .
|
||||||
'try [OpenID](%%action.openidlogin%%). ');
|
'try [OpenID](%%action.openidlogin%%). ');
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function show_top($error=NULL) {
|
function show_top($error=NULL) {
|
||||||
if ($error) {
|
if ($error) {
|
||||||
|
Loading…
Reference in New Issue
Block a user