GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

restore enhanced login instructions, lost in gettext() switchover 

darcs-hash:20080713151004-84dde-6818a5392e8d78e6672399dfbc183b571751953a.gz
This commit is contained in:
Evan Prodromou 2008-07-13 11:10:04 -04:00
parent a55044ac03
commit 6ec4f035bd
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
actions/login.php
View File

@ -109,10 +109,21 @@ class LoginAction extends Action {
} }
function get_instructions() { function get_instructions() {
return _('Login with your username and password. ' . if (common_logged_in() &&
'Don\'t have a username yet? ' . !common_is_real_login() &&
'[Register](%%action.register%%) a new account, or ' . common_get_returnto())
'try [OpenID](%%action.openidlogin%%). '); {
# 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. ' .
'Don\'t have a username yet? ' .
'[Register](%%action.register%%) a new account, or ' .
'try [OpenID](%%action.openidlogin%%). ');
}
} }
function show_top($error=NULL) { function show_top($error=NULL) {