}
if (common_config('site', 'inviteonly') && empty($this->code)) {
- $this->clientError(_('Sorry. Only those invited can register.'));
+ $this->clientError(_('Sorry, only invited people can register.'));
return false;
}
if (!empty($this->code)) {
$this->invite = Invitation::staticGet('code', $this->code);
if (empty($this->invite)) {
- $this->clientError(_('Sorry. This is an invalid invitation code.'));
+ $this->clientError(_('Sorry, invalid invitation code.'));
return false;
}
// Store this in case we need it
$bio = $this->trimmed('bio');
$location = $this->trimmed('location');
- // We do not trim these... whitespace is OK in a password!
+ // We don't trim these... whitespace is OK in a password!
$password = $this->arg('password');
$confirm = $this->arg('confirm');
}
if (common_config('site', 'inviteonly') && !($code && $invite)) {
- $this->clientError(_('Sorry. Only those invited can register.'));
+ $this->clientError(_('Sorry, only invited people can register.'));
return;
}
// Re-init language env in case it changed (not yet, but soon)
common_init_language();
+
$this->showSuccess();
} else {
$this->showForm(_('Invalid username or password.'));
function nicknameExists($nickname)
{
$user = User::staticGet('nickname', $nickname);
- return ($user !== false);
+ return is_object($user);
}
/**
return false;
}
$user = User::staticGet('email', $email);
- return ($user !== false);
+ return is_object($user);
}
// overrrided to add entry-title class
}
if (common_config('site', 'inviteonly') && !($code && $invite)) {
- $this->clientError(_('Sorry. Only those invited can register.'));
+ $this->clientError(_('Sorry, only invited people can register.'));
return;
}
array('nickname' => $nickname));
$this->elementStart('div', 'success');
- $instr = sprintf(_('Congratulations, %s! And welcome to %%%%site.name%%%%. '.
+ $instr = sprintf(_('Congratulations, %1$s! And welcome to %%%%site.name%%%%. '.
'From here, you may want to...'. "\n\n" .
- '* Go to [your profile](%s) '.
+ '* Go to [your profile](%2$s) '.
'and post your first message.' . "\n" .
'* Add a [Jabber/GTalk address]'.
'(%%%%action.imsettings%%%%) '.
'so you can send notices '.
'through instant messages.' . "\n" .
- '* [Search for users](%%%%action.peoplesearch%%%%) '.
+ '* [Search for people](%%%%action.peoplesearch%%%%) '.
'that you may know or '.
'that share your interests. ' . "\n" .
'* Update your [profile settings]'.