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

Merge branch 'testing' into 0.9.x

Browse Source
This commit is contained in:
Brion Vibber 2010-04-19 18:47:56 +02:00
commit fee6b78e28
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
actions/login.php
View File

@ -267,9 +267,13 @@ class LoginAction extends Action
'user name and password ' . 'user name and password ' .
'before changing your settings.'); 'before changing your settings.');
} else { } else {
return _('Login with your username and password. ' . $prompt = _('Login with your username and password.');
'Don\'t have a username yet? ' . if (!common_config('site', 'closed') && !common_config('site', 'inviteonly')) {
'[Register](%%action.register%%) a new account.'); $prompt .= ' ';
$prompt .= _('Don\'t have a username yet? ' .
'[Register](%%action.register%%) a new account.');
}
return $prompt;
} }
} }

2
lib/action.php
View File

@ -467,7 +467,7 @@ class Action extends HTMLOutputter // lawsuit
_m('MENU', 'Logout'), $tooltip, false, 'nav_logout'); _m('MENU', 'Logout'), $tooltip, false, 'nav_logout');
} }
else { else {
if (!common_config('site', 'closed')) { if (!common_config('site', 'closed') && !common_config('site', 'inviteonly')) {
// TRANS: Tooltip for main menu option "Register" // TRANS: Tooltip for main menu option "Register"
$tooltip = _m('TOOLTIP', 'Create an account'); $tooltip = _m('TOOLTIP', 'Create an account');
$this->menuItem(common_local_url('register'), $this->menuItem(common_local_url('register'),