* Copyright (C) 2011, StatusNet, Inc.
*
* Registration confirmation form
- *
+ *
* PHP version 5
*
* This program is free software: you can redistribute it and/or modify
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
-
class ConfirmRegistrationForm extends Form
{
protected $code;
function formData()
{
$this->out->element('p', 'instructions',
- sprintf(_('Enter a password to confirm your new account.')));
-
+ // TRANS: Form instructions.
+ sprintf(_m('Enter a password to confirm your new account.')));
+
$this->hidden('code', $this->code);
$this->out->elementStart('ul', 'form_data');
$this->elementStart('li');
- $this->element('label', array('for' => 'nickname-ignore'), _('User name'));
+ $this->element('label', array('for' => 'nickname-ignore'), _m('User name'));
$this->element('input', array('name' => 'nickname-ignore',
'type' => 'text',
$this->elementStart('li');
- $this->element('label', array('for' => 'email-ignore'), _('Email'));
+ // TRANS: Field label.
+ $this->element('label', array('for' => 'email-ignore'), _m('Email address'));
$this->element('input', array('name' => 'email-ignore',
'type' => 'text',
$this->elementStart('li');
// TRANS: Field label on account registration page.
- $this->password('password1', _('Password'),
+ $this->password('password1', _m('Password'),
// TRANS: Field title on account registration page.
- _('6 or more characters.'));
+ _m('6 or more characters.'));
$this->elementEnd('li');
$this->elementStart('li');
// TRANS: Field label on account registration page. In this field the password has to be entered a second time.
$this->password('password2', _m('PASSWORD','Confirm'),
// TRANS: Field title on account registration page.
- _('Same as password above.'));
+ _m('Same as password above.'));
$this->elementEnd('li');
$this->elementStart('li');
$this->elementStart('label', array('class' => 'checkbox',
'for' => 'tos'));
-
- $this->raw(sprintf(_('I agree to the <a href="%1$s">Terms of service</a> and '.
+ // TRANS: Checkbox title for terms of service and privacy policy.
+ $this->raw(sprintf(_
m('I agree to the <a href="%1$s">Terms of service</a> and '.
'<a href="%1$s">Privacy policy</a> of this site.'),
common_local_url('doc', array('title' => 'tos')),
common_local_url('doc', array('title' => 'privacy'))));
-
+
$this->elementEnd('label');
$this->elementEnd('li');
function formActions()
{
- // TRANS: Button text for action to save a new bookmark.
+ // TRANS: Button text for action to register.
$this->out->submit('submit', _m('BUTTON', 'Register'));
}
* Copyright (C) 2011, StatusNet, Inc.
*
* Register a user by their email address
- *
+ *
* PHP version 5
*
* This program is free software: you can redistribute it and/or modify
*
* There are four cases where we're called:
*
- * 1. GET, no arguments. Initial registration; ask for an email address.
+ * 1. GET, no arguments. Initial registration; ask for an email address.
* 2. POST, email address argument. Initial registration; send an email to confirm.
* 3. GET, code argument. Confirming an invitation or a registration; look them up,
- * create the relevant user if possible, login as that user, and
+ * create the relevant user if possible, login as that user, and
* show a password-entry form.
* 4. POST, password argument. After confirmation, set the password for the new
* user, and redirect to a registration complete action with some instructions.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
-
class EmailregisterAction extends Action
{
const NEWEMAIL = 1;
$this->code = $this->trimmed('code');
if (empty($this->code)) {
- throw new ClientException(_('No confirmation code.'));
+ // TRANS: Client exception thrown when no confirmation code was provided.
+ throw new ClientException(_m('No confirmation code.'));
}
$this->invitation = Invitation::staticGet('code', $this->code);
$this->confirmation = Confirm_address::staticGet('code', $this->code);
if (empty($this->confirmation)) {
- throw new ClientException(_('No such confirmation code.'), 403);
+ // TRANS: Client exception thrown when given confirmation code was not issued.
+ throw new ClientException(_m('No such confirmation code.'), 403);
}
}
$this->password1 = $this->trimmed('password1');
$this->password2 = $this->trimmed('password2');
-
+
$this->tos = $this->boolean('tos');
}
} else { // GET
$this->confirmation = Confirm_address::staticGet('code', $this->code);
if (empty($this->confirmation)) {
- throw new ClientException(_('No such confirmation code.'), 405);
+ // TRANS: Client exception thrown when given confirmation code was not issued.
+ throw new ClientException(_m('No such confirmation code.'), 405);
}
}
}
case self::SETPASSWORD:
case self::CONFIRMINVITE:
case self::CONFIRMREGISTER:
- // TRANS: Title for page where to change password.
+ // TRANS: Title for page where to register with a confirmation code.
return _m('TITLE','Complete registration');
break;
}
$old = User::staticGet('email', $this->email);
if (!empty($old)) {
- $this->error = sprintf(_('A user with that email address already exists. You can use the '.
+ // TRANS: Error text when trying to register with an already registered e-mail address.
+ $this->error = sprintf(_m('A user with that email address already exists. You can use the '.
'<a href="%s">password recovery</a> tool to recover a missing password.'),
common_local_url('recoverpassword'));
$this->showRegistrationForm();
Event::handle('EndValidateUserEmail', array(null, $this->email, &$valid));
}
if (!$valid) {
- $this->error = _('Not a valid email address.');
+ // TRANS: Error text when trying to register with an invalid e-mail address.
+ $this->error = _m('Not a valid email address.');
$this->showRegistrationForm();
return;
}
if (empty($confirm)) {
$confirm = Confirm_address::saveNew(null, $this->email, 'register');
- $prompt = sprintf(_('An email was sent to %s to confirm that address. Check your email inbox for instructions.'),
+ // TRANS: Confirmation text after initial registration.
+ $prompt = sprintf(_m('An email was sent to %s to confirm that address. Check your email inbox for instructions.'),
$this->email);
} else {
- $prompt = sprintf(_('The address %s was already registered but not confirmed. The confirmation code was resent.'),
+ // TRANS: Confirmation text after re-requesting an e-mail confirmation code.
+ $prompt = sprintf(_m('The address %s was already registered but not confirmed. The confirmation code was resent.'),
$this->email);
}
$this->sendConfirmEmail($confirm);
$this->complete = $prompt;
-
+
$this->showPage();
}
} else if (!empty($this->confirmation)) {
$email = $this->confirmation->address;
}
-
+
$nickname = $this->nicknameFromEmail($email);
$this->form = new ConfirmRegistrationForm($this,
} else if (!empty($this->confirmation)) {
$email = $this->confirmation->address;
} else {
+ // TRANS: Exception.
throw new Exception('No confirmation thing.');
}
if (!$this->tos) {
- $this->error = _('You must accept the terms of service and privacy policy to register.');
+ // TRANS: Error text when trying to register without accepting TOS and privacy policy.
+ $this->error = _m('You must accept the terms of service and privacy policy to register.');
return;
} else if (empty($this->password1)) {
- $this->error = _('You must set a password');
+ // TRANS: Error text when trying to register without a password.
+ $this->error = _m('You must set a password.');
} else if (strlen($this->password1) < 6) {
- $this->error = _('Password must be 6 or more characters.');
+ // TRANS: Error text when trying to register with too short a password.
+ $this->error = _m('Password must be 6 or more characters.');
} else if ($this->password1 != $this->password2) {
- $this->error = _('Passwords do not match.');
+ $this->error = _m('Passwords do not match.');
}
if (!empty($this->error)) {
'email_confirmed' => true));
if (empty($this->user)) {
- throw new Exception("Failed to register user.");
+ // TRANS: Exception thrown when user registration fails.
+ throw new Exception('Failed to register user.');
}
common_set_user($this->user);
} else if (!empty($this->confirmation)) {
$this->confirmation->delete();
} else {
+ // TRANS: Exception.
throw new Exception('No confirmation thing.');
}
$headers['From'] = mail_notify_from();
$headers['To'] = trim($confirm->address);
- $headers['Subject'] = sprintf(_('Confirm your registration on %1$s'), $sitename);
+ // TRANS: Subject for confirmation e-mail.
+ // TRANS: %s is the StatusNet sitename.
+ $headers['Subject'] = sprintf(_m('Confirm your registration on %s'), $sitename);
$confirmUrl = common_local_url('register', array('code' => $confirm->code));
- $body = sprintf(_('Someone (probably you) has requested an account on %1$s using this email address.'.
+ // TRANS: Body for confirmation e-mail.
+ // TRANS: %1$s is the StatusNet sitename, %2$s is the confirmation URL.
+ $body = sprintf(_m('Someone (probably you) has requested an account on %1$s using this email address.'.
"\n".
'To confirm the address, click the following URL or copy it into the address bar of your browser.'.
"\n".
*
* @return boolean is read only action?
*/
-
function isReadOnly($args)
{
return false;
function nicknameFromEmail($email)
{
$parts = explode('@', $email);
-
+
$nickname = $parts[0];
-
+
$nickname = preg_replace('/[^A-Za-z0-9]/', '', $nickname);
$nickname = Nickname::normalize($nickname);
*
* @return void
*/
-
function showLocalNav()
{
$nav = new LoginGroupNav($this);
* Copyright (C) 2011, StatusNet, Inc.
*
* Email registration form
- *
+ *
* PHP version 5
*
* This program is free software: you can redistribute it and/or modify
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
-
class EmailRegistrationForm extends Form
{
protected $email;
function formData()
{
$this->out->element('p', 'instructions',
- _('Enter your email address to register for an account.'));
-
+ // TRANS: Form instructions.
+ _m('Enter your email address to register for an account.'));
+
$this->out->elementStart('fieldset', array('id' => 'new_bookmark_data'));
$this->out->elementStart('ul', 'form_data');
$this->li();
$this->out->input('email',
- // TRANS: Field label on form for adding a new bookmark.
+ // TRANS: Field label on form for registering an account.
_m('LABEL','E-mail address'),
$this->email);
$this->unli();
*
* @return void
*/
-
function formActions()
{
- // TRANS: Button text for action to save a new bookmark.
+ // TRANS: Button text for registering an account.
$this->out->submit('submit', _m('BUTTON', 'Register'));
}
*
* @return int ID of the form
*/
-
function id()
{
return 'form_email_registration';
*
* @return string URL to post to
*/
-
function action()
{
return common_local_url('register');
return 'form_email_registration form_settings';
}
}
-
projects / quix0rs-gnu-social.git / commitdiff