wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conflict resolution after pulling from mikenz

Browse Source 
darcs-hash:20080713215601-84dde-371d54221d9ffbed500e8d3c9e0ad4bb15bd5c30.gz
This commit is contained in:
Evan Prodromou 2008-07-13 17:56:01 -04:00
parent bdd0091e70
commit e3f4165d69
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actions/imsettings.php
View File

@ -52,9 +52,7 @@ class ImsettingsAction extends SettingsAction {
common_element_start('p');
common_element('span', 'address unconfirmed', $confirm->address);
common_element('span', 'input_instructions',
sprintf(_('Awaiting confirmation on this address. Check your ' .
'Jabber/GTalk account for a message with further ' .
'instructions. (Did you add %s to your buddy list?)',
sprintf(_('Awaiting confirmation on this address. Check your Jabber/GTalk account for a message with further instructions. (Did you add %s to your buddy list?)',
jabber_daemon_address())));
common_hidden('jabber', $confirm->address);
common_element_end('p');

11
actions/login.php
View File

@ -109,11 +109,22 @@ class LoginAction extends Action {
}
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. ' .
'Don\'t have a username yet? ' .
'[Register](%%action.register%%) a new account, or ' .
'try [OpenID](%%action.openidlogin%%). ');
}
}
function show_top($error=NULL) {
if ($error) {