'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
$this->show_form(_('Nickname must have only lowercase letters and numbers and no spaces.'));
} else if ($this->nickname_exists($nickname)) {
- $this->show_form(_('Nickname already exists.'));
+ $this->show_form(_('Nickname already in use. Try another one.'));
} else if (!User::allowed_nickname($nickname)) {
$this->show_form(_('Not a valid nickname.'));
} else if ($this->email_exists($email)) {
$this->show_form(_('Email address already exists.'));
} else if ($password != $confirm) {
$this->show_form(_('Passwords don\'t match.'));
- } else if ($this->register_user($nickname, $password, $email)) {
- $user = $this->register_user($nickname, $password, $email);
+ } else if ($user = $this->register_user($nickname, $password, $email)) {
if (!$user) {
$this->show_form(_('Invalid username or password.'));
return;
common_input('email', _('Email'), NULL,
_('Used only for updates, announcements, and password recovery'));
common_checkbox('rememberme', _('Remember me'), false,
- _('Automatically login in the future; ' .
- 'not for shared computers!'));
+ _('Automatically login in the future; not for shared computers!'));
common_element_start('p');
common_element('input', array('type' => 'checkbox',
'id' => 'license',