Skip to content

G
gnu-social
Commit a159352b authored by Siebrand Mazeland's avatar Siebrand Mazeland
Browse files
Options

* improve L10n consistency for English. For example proper punctuation for all... 

* improve L10n consistency for English. For example proper punctuation for all button and label titles.
* fix some i18n bugs (in-message variables).
* update/add translator documentation.
* remove superfluous whitespace.
parent be682a3f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 141 deletions
actions/apidirectmessagenew.php
View file @ a159352b
......@@ -141,7 +141,7 @@ class ApiDirectMessageNewAction extends ApiAuthAction
} else if (!$this->user->mutuallySubscribed($this->other)) {
$this->clientError(
// TRANS: Client error displayed trying to direct message another user who's not a friend (403).
_('Can\'t send direct messages to users who aren\'t your friend.'),
_('Cannot send direct messages to users who aren\'t your friend.'),
403,
$this->format
);
......
actions/apioauthaccesstoken.php
View file @ a159352b
......@@ -99,7 +99,7 @@ class ApiOauthAccessTokenAction extends ApiOauthAction
common_log(LOG_WARNING, $msg);
// TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
$this->clientError(_("Invalid request token or verifier."), 400, 'text');
$this->clientError(_('Invalid request token or verifier.'), 400, 'text');
} else {
common_log(
LOG_INFO,
......
actions/apistatusesshow.php
View file @ a159352b
......@@ -141,7 +141,7 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
default:
// TRANS: Exception thrown requesting an unsupported notice output format.
// TRANS: %s is the requested output format.
throw new Exception(sprintf(_("Unsupported format: %s"), $this->format));
throw new Exception(sprintf(_("Unsupported format: %s."), $this->format));
}
} else {
// XXX: Twitter just sets a 404 header and doens't bother
......@@ -224,7 +224,7 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
{
if ($this->format != 'atom') {
// TRANS: Client error displayed when trying to delete a notice not using the Atom format.
$this->clientError(_("Can only delete using the Atom format."));
$this->clientError(_('Can only delete using the Atom format.'));
return;
}
......
actions/apitimelineuser.php
View file @ a159352b
......@@ -329,7 +329,6 @@ class ApiTimelineUserAction extends ApiBareAuthAction
$saved = null;
if (Event::handle('StartAtomPubNewActivity', array(&$activity, $this->user, &$saved))) {
if ($activity->verb != ActivityVerb::POST) {
// TRANS: Client error displayed when not using the POST verb. Do not translate POST.
$this->clientError(_('Can only handle POST activities.'));
......@@ -405,6 +404,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
if (!empty($notice)) {
// TRANS: Client error displayed when using another format than AtomPub.
// TRANS: %s is the notice URI.
$this->clientError(sprintf(_('Notice with URI "%s" already exists.'),
$note->id));
return;
......
actions/atompubshowmembership.php
View file @ a159352b
......@@ -142,7 +142,6 @@ class AtompubshowmembershipAction extends ApiAuthAction
*
* @return void
*/
function deleteMembership()
{
if (empty($this->auth_user) ||
......
actions/avatarsettings.php
View file @ a159352b
......@@ -211,7 +211,7 @@ class AvatarsettingsAction extends AccountSettingsAction
array('id' => 'avatar_original',
'class' => 'avatar_view'));
// TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
$this->element('h2', null, _("Original"));
$this->element('h2', null, _('Original'));
$this->elementStart('div', array('id'=>'avatar_original_view'));
$this->element('img', array('src' => Avatar::url($this->filedata['filename']),
'width' => $this->filedata['width'],
......@@ -224,7 +224,7 @@ class AvatarsettingsAction extends AccountSettingsAction
array('id' => 'avatar_preview',
'class' => 'avatar_view'));
// TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
$this->element('h2', null, _("Preview"));
$this->element('h2', null, _('Preview'));
$this->elementStart('div', array('id'=>'avatar_preview_view'));
$this->element('img', array('src' => Avatar::url($this->filedata['filename']),
'width' => AVATAR_PROFILE_SIZE,
......@@ -341,8 +341,8 @@ class AvatarsettingsAction extends AccountSettingsAction
$this->mode = 'crop';
// TRANS: Avatar upload form unstruction after uploading a file.
$this->showForm(_('Pick a square area of the image to be your avatar'),
// TRANS: Avatar upload form instruction after uploading a file.
$this->showForm(_('Pick a square area of the image to be your avatar.'),
true);
}
......
actions/backupaccount.php
View file @ a159352b
......@@ -58,7 +58,7 @@ class BackupaccountAction extends Action
function title()
{
// TRANS: Title for backup account page.
return _("Backup account");
return _('Backup account');
}
/**
......@@ -249,6 +249,6 @@ class BackupAccountForm extends Form
'submit',
null,
// TRANS: Title for submit button to backup an account on the backup account page.
_('Backup your account'));
_('Backup your account.'));
}
}
actions/block.php
View file @ a159352b
......@@ -155,14 +155,14 @@ class BlockAction extends ProfileFormAction
'submit form_action-primary',
'no',
// TRANS: Submit button title for 'No' when blocking a user.
_('Do not block this user'));
_('Do not block this user.'));
$this->submit('form_action-yes',
// TRANS: Button label on the user block form.
_m('BUTTON','Yes'),
'submit form_action-secondary',
'yes',
// TRANS: Submit button title for 'Yes' when blocking a user.
_('Block this user'));
_('Block this user.'));
$this->elementEnd('fieldset');
$this->elementEnd('form');
}
......
actions/deleteapplication.php
View file @ a159352b
......@@ -158,13 +158,13 @@ class DeleteapplicationAction extends Action
'submit form_action-primary',
'no',
// TRANS: Submit button title for 'No' when deleting an application.
_('Do not delete this application'));
_('Do not delete this application.'));
$this->submit('form_action-yes',
// TRANS: Button label on the delete application form.
_m('BUTTON','Yes'),
'submit form_action-secondary',
// TRANS: Submit button title for 'Yes' when deleting an application.
'yes', _('Delete this application'));
'yes', _('Delete this application.'));
$this->elementEnd('fieldset');
$this->elementEnd('form');
}
......
actions/deletegroup.php
View file @ a159352b
......@@ -221,14 +221,14 @@ class DeletegroupAction extends RedirectingAction
'submit form_action-primary',
'no',
// TRANS: Submit button title for 'No' when deleting a group.
_('Do not delete this group'));
_('Do not delete this group.'));
$this->submit('form_action-yes',
// TRANS: Button label on the delete group form.
_m('BUTTON','Yes'),
'submit form_action-secondary',
'yes',
// TRANS: Submit button title for 'Yes' when deleting a group.
_('Delete this group'));
_('Delete this group.'));
$this->elementEnd('fieldset');
$this->elementEnd('form');
}
......
actions/deletenotice.php
View file @ a159352b
......@@ -156,14 +156,14 @@ class DeletenoticeAction extends Action
'submit form_action-primary',
'no',
// TRANS: Submit button title for 'No' when deleting a notice.
_("Do not delete this notice"));
_('Do not delete this notice.'));
$this->submit('form_action-yes',
// TRANS: Button label on the delete notice form.
_m('BUTTON','Yes'),
'submit form_action-secondary',
'yes',
// TRANS: Submit button title for 'Yes' when deleting a notice.
_('Delete this notice'));
_('Delete this notice.'));
$this->elementEnd('fieldset');
$this->elementEnd('form');
}
......
actions/deleteuser.php
View file @ a159352b
......@@ -155,14 +155,14 @@ class DeleteuserAction extends ProfileFormAction
'submit form_action-primary',
'no',
// TRANS: Submit button title for 'No' when deleting a user.
_('Do not delete this user'));
_('Do not delete this user.'));
$this->submit('form_action-yes',
// TRANS: Button label on the delete user form.
_m('BUTTON','Yes'),
'submit form_action-secondary',
'yes',
// TRANS: Submit button title for 'Yes' when deleting a user.
_('Delete this user'));
_('Delete this user.'));
$this->elementEnd('fieldset');
$this->elementEnd('form');
}
......
actions/designadminpanel.php
View file @ a159352b
......@@ -336,7 +336,7 @@ class DesignadminpanelAction extends AdminPanelAction
if (!in_array($values['theme'], Theme::listAvailable())) {
// TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
// TRANS: %s is the chosen unavailable theme.
$this->clientError(sprintf(_("Theme not available: %s."), $values['theme']));
$this->clientError(sprintf(_('Theme not available: %s.'), $values['theme']));
}
}
......@@ -443,7 +443,7 @@ class DesignAdminPanelForm extends AdminForm
// TRANS: Field label for StatusNet site logo.
_('Site logo'),
// TRANS: Title for field label for StatusNet site logo.
'Logo for the site (full URL)');
'Logo for the site (full URL).');
$this->unli();
$this->li();
......@@ -451,7 +451,7 @@ class DesignAdminPanelForm extends AdminForm
// TRANS: Field label for SSL StatusNet site logo.
_('SSL logo'),
// TRANS: Title for field label for SSL StatusNet site logo.
'Logo to show on SSL pages');
'Logo to show on SSL pages.');
$this->unli();
$this->out->elementEnd('ul');
......@@ -717,7 +717,7 @@ class DesignAdminPanelForm extends AdminForm
// TRANS: Button text for resetting theme settings.
$this->out->submit('defaults', _m('BUTTON','Use defaults'), 'submit form_action-default',
// TRANS: Title for button for resetting theme settings.
'defaults', _('Restore default designs'));
'defaults', _('Restore default designs.'));
$this->out->element('input', array('id' => 'settings_design_reset',
'type' => 'reset',
......@@ -725,7 +725,7 @@ class DesignAdminPanelForm extends AdminForm
'value' => 'Reset',
'class' => 'submit form_action-primary',
// TRANS: Title for button for resetting theme settings.
'title' => _('Reset back to default')));
'title' => _('Reset back to default.')));
$this->out->submit('save',
// TRANS: Button text for saving theme settings.
......@@ -733,6 +733,6 @@ class DesignAdminPanelForm extends AdminForm
'submit form_action-secondary',
'save',
// TRANS: Title for button for saving theme settings.
_('Save design'));
_('Save design.'));
}
}
actions/emailsettings.php
View file @ a159352b
......@@ -527,7 +527,7 @@ class EmailsettingsAction extends AccountSettingsAction
if (!$user->updateKeys($orig)) {
common_log_db_error($user, 'UPDATE', __FILE__);
// TRANS: Server error thrown on database error removing incoming e-mail address.
$this->serverError(_("Could not update user record."));
$this->serverError(_('Could not update user record.'));
}
// TRANS: Message given after successfully removing an incoming e-mail address.
......@@ -551,7 +551,7 @@ class EmailsettingsAction extends AccountSettingsAction
if (!$user->updateKeys($orig)) {
common_log_db_error($user, 'UPDATE', __FILE__);
// TRANS: Server error thrown on database error adding incoming e-mail address.
$this->serverError(_("Could not update user record."));
$this->serverError(_('Could not update user record.'));
}
// TRANS: Message given after successfully adding an incoming e-mail address.
......
actions/favor.php
View file @ a159352b
......@@ -92,7 +92,7 @@ class FavorAction extends Action
$this->startHTML('text/xml;charset=utf-8');
$this->elementStart('head');
// TRANS: Page title for page on which favorite notices can be unfavourited.
$this->element('title', null, _('Disfavor favorite'));
$this->element('title', null, _('Disfavor favorite.'));
$this->elementEnd('head');
$this->elementStart('body');
$disfavor = new DisFavorForm($this, $notice);
......
actions/groupblock.php
View file @ a159352b
......@@ -188,14 +188,14 @@ class GroupblockAction extends RedirectingAction
'submit form_action-primary',
'no',
// TRANS: Submit button title for 'No' when blocking a user from a group.
_('Do not block this user from this group'));
_('Do not block this user from this group.'));
$this->submit('form_action-yes',
// TRANS: Button label on the form to block a user from a group.
_m('BUTTON','Yes'),
'submit form_action-secondary',
'yes',
// TRANS: Submit button title for 'Yes' when blocking a user from a group.
_('Block this user from this group'));
_('Block this user from this group.'));
$this->elementEnd('fieldset');
$this->elementEnd('form');
}
......
actions/grouplogo.php
View file @ a159352b
......@@ -204,7 +204,7 @@ class GrouplogoAction extends GroupDesignAction
$this->elementStart('li', array('id' => 'avatar_original',
'class' => 'avatar_view'));
// TRANS: Uploaded original file in group logo form.
$this->element('h2', null, _("Original"));
$this->element('h2', null, _('Original'));
$this->elementStart('div', array('id'=>'avatar_original_view'));
$this->element('img', array('src' => $this->group->original_logo,
'alt' => $this->group->nickname));
......@@ -216,7 +216,7 @@ class GrouplogoAction extends GroupDesignAction
$this->elementStart('li', array('id' => 'avatar_preview',
'class' => 'avatar_view'));
// TRANS: Header for preview of to be displayed group logo.
$this->element('h2', null, _("Preview"));
$this->element('h2', null, _('Preview'));
$this->elementStart('div', array('id'=>'avatar_preview_view'));
$this->element('img', array('src' => $this->group->homepage_logo,
'width' => AVATAR_PROFILE_SIZE,
......@@ -267,7 +267,7 @@ class GrouplogoAction extends GroupDesignAction
array('id' => 'avatar_original',
'class' => 'avatar_view'));
// TRANS: Header for originally uploaded file before a crop on the group logo page.
$this->element('h2', null, _("Original"));
$this->element('h2', null, _('Original'));
$this->elementStart('div', array('id'=>'avatar_original_view'));
$this->element('img', array('src' => Avatar::url($this->filedata['filename']),
'width' => $this->filedata['width'],
......@@ -280,7 +280,7 @@ class GrouplogoAction extends GroupDesignAction
array('id' => 'avatar_preview',
'class' => 'avatar_view'));
// TRANS: Header for the cropped group logo on the group logo page.
$this->element('h2', null, _("Preview"));
$this->element('h2', null, _('Preview'));
$this->elementStart('div', array('id'=>'avatar_preview_view'));
$this->element('img', array('src' => Avatar::url($this->filedata['filename']),
'width' => AVATAR_PROFILE_SIZE,
......
actions/inbox.php
View file @ a159352b
......@@ -126,4 +126,4 @@ class InboxMessageListItem extends MessageListItem
{
return $this->message->getFrom();
}
}
\ No newline at end of file
}
actions/login.php
View file @ a159352b
......@@ -42,13 +42,11 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
class LoginAction extends Action
{
/**
* Has there been an error?
*/
var $error = null;
/**
......@@ -56,7 +54,6 @@ class LoginAction extends Action
*
* @return boolean false
*/
function isReadOnly($args)
{
return false;
......@@ -69,7 +66,6 @@ class LoginAction extends Action
* @param $args
* @return string title
*/
function prepare($args)
{
parent::prepare($args);
......@@ -93,7 +89,6 @@ class LoginAction extends Action
*
* @return void
*/
function handle($args)
{
parent::handle($args);
......@@ -117,7 +112,6 @@ class LoginAction extends Action
*
* @return void
*/
function checkLogin($user_id=null, $token=null)
{
// XXX: login throttle
......@@ -186,7 +180,6 @@ class LoginAction extends Action
*
* @return void
*/
function showForm($error=null)
{
$this->error = $error;
......@@ -204,7 +197,6 @@ class LoginAction extends Action
*
* @return string title of the page
*/
function title()
{
return _('Login');
......@@ -218,7 +210,6 @@ class LoginAction extends Action
*
* @return void
*/
function showPageNotice()
{
if ($this->error) {
......@@ -238,7 +229,6 @@ class LoginAction extends Action
*
* @return void
*/
function showContent()
{
$this->elementStart('form', array('method' => 'post',
......@@ -278,7 +268,6 @@ class LoginAction extends Action
*
* @return void
*/
function getInstructions()
{
if (common_logged_in() && !common_is_real_login() &&
......@@ -306,7 +295,6 @@ class LoginAction extends Action
*
* @return void
*/
function showLocalNav()
{
$nav = new LoginGroupNav($this);
......
actions/oauthappssettings.php
View file @ a159352b
......@@ -166,6 +166,5 @@ class OauthappssettingsAction extends SettingsAction
'Try again, please.'));
return;
}
}
}
actions/oauthconnectionssettings.php
View file @ a159352b
......@@ -64,7 +64,6 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction
*
* @return string Title of the page
*/
function title()
{
// TRANS: Title for OAuth connection settings.
......@@ -76,7 +75,6 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction
*
* @return instructions for use
*/
function getInstructions()
{
// TRANS: Instructions for OAuth connection settings.
......
actions/oembed.php
View file @ a159352b
......@@ -61,7 +61,7 @@ class OembedAction extends Action
$proxy_args = $r->map($path);
if (!$proxy_args) {
$this->serverError(_("$path not found."), 404);
$this->serverError(sprintf(_('"%s" not found.'),$path), 404);
}
$oembed=array();
$oembed['version']='1.0';
......@@ -73,7 +73,7 @@ class OembedAction extends Action
$id = $proxy_args['notice'];
$notice = Notice::staticGet($id);
if(empty($notice)){
$this->serverError(_("Notice $id not found."), 404);
$this->serverError(sprintf(_("Notice %s not found."),$id), 404);
}
$profile = $notice->getProfile();
if (empty($profile)) {
......@@ -92,7 +92,7 @@ class OembedAction extends Action
$id = $proxy_args['attachment'];
$attachment = File::staticGet($id);
if(empty($attachment)){
$this->serverError(_("Attachment $id not found."), 404);
$this->serverError(sprintf(_('Attachment %s not found.'),$id), 404);
}
if(empty($attachment->filename) && $file_oembed = File_oembed::staticGet('file_id', $attachment->id)){
// Proxy the existing oembed information
......@@ -133,7 +133,7 @@ class OembedAction extends Action
if($attachment->title) $oembed['title']=$attachment->title;
break;
default:
$this->serverError(_("$path not supported for oembed requests."), 501);
$this->serverError(sprintf(_('"%s" not supported for oembed requests.'),$path), 501);
}
switch($args['format']){
case 'xml':
......
actions/othersettings.php
View file @ a159352b
......@@ -189,6 +189,7 @@ class OthersettingsAction extends AccountSettingsAction
$user->query('COMMIT');
// TRANS: Confirmation message after saving preferences.
$this->showForm(_('Preferences saved.'), true);
}
}
actions/outbox.php
View file @ a159352b
......@@ -26,7 +26,6 @@
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
......@@ -43,7 +42,6 @@ require_once INSTALLDIR.'/lib/mailbox.php';
* @link http://status.net/
* @see MailboxAction
*/
class OutboxAction extends MailboxAction
{
/**
......@@ -51,13 +49,15 @@ class OutboxAction extends MailboxAction
*
* @return string page title
*/
function title()
{
if ($this->page > 1) {
// TRANS: Title for outbox for any but the fist page.
// TRANS: %1$s is the user nickname, %2$d is the page number.
return sprintf(_('Outbox for %1$s - page %2$d'),
$this->user->nickname, $page);
} else {
// TRANS: Title for first page of outbox.
return sprintf(_('Outbox for %s'), $this->user->nickname);
}
}
......@@ -71,7 +71,6 @@ class OutboxAction extends MailboxAction
*
* @see MailboxAction::getMessages()
*/
function getMessages()
{
$message = new Message();
......@@ -98,9 +97,9 @@ class OutboxAction extends MailboxAction
*
* @return string localised instructions for using the page
*/
function getInstructions()
{
// TRANS: Instructions for outbox.
return _('This is your outbox, which lists private messages you have sent.');
}
}
......@@ -124,4 +123,4 @@ class OutboxMessageListItem extends MessageListItem
{
return $this->message->getTo();
}
}
\ No newline at end of file
}
actions/passwordsettings.php
View file @ a159352b
......@@ -106,11 +106,11 @@ class PasswordsettingsAction extends AccountSettingsAction
}
$this->elementStart('li');
$this->password('newpassword', _('New password'),
_('6 or more characters'));
_('6 or more characters.'));
$this->elementEnd('li');
$this->elementStart('li');
$this->password('confirm', _('Confirm'),
_('Same as password above'));
_('Same as password above.'));
$this->elementEnd('li');
$this->elementEnd('ul');
......@@ -128,7 +128,6 @@ class PasswordsettingsAction extends AccountSettingsAction
*
* @return void
*/
function handlePost()
{
// CSRF protection
......@@ -183,7 +182,7 @@ class PasswordsettingsAction extends AccountSettingsAction
}
if (!$user->update($original)) {
$this->serverError(_('Can\'t save new password.'));
$this->serverError(_('Cannot save new password.'));
return;
}
Event::handle('EndChangePassword', array($user));
......
actions/profilesettings.php
View file @ a159352b
......@@ -161,14 +161,14 @@ class ProfilesettingsAction extends AccountSettingsAction
$this->input('tags', _('Tags'),
($this->arg('tags')) ? $this->arg('tags') : implode(' ', $user->getSelfTags()),
// TRANS: Tooltip for field label in form for profile settings.
_('Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated'));
_('Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated.'));
$this->elementEnd('li');
$this->elementStart('li');
$language = common_language();
// TRANS: Dropdownlist label in form for profile settings.
$this->dropdown('language', _('Language'),
// TRANS: Tooltip for dropdown list label in form for profile settings.
get_nice_language_list(), _('Preferred language'),
get_nice_language_list(), _('Preferred language.'),
false, $language);
$this->elementEnd('li');
$timezone = common_timezone();
......@@ -187,7 +187,7 @@ class ProfilesettingsAction extends AccountSettingsAction
$this->checkbox('autosubscribe',
// TRANS: Checkbox label in form for profile settings.
_('Automatically subscribe to whoever '.
'subscribes to me (best for non-humans)'),
'subscribes to me (best for non-humans).'),
($this->arg('autosubscribe')) ?
$this->boolean('autosubscribe') : $user->autosubscribe);
$this->elementEnd('li');
......@@ -288,7 +288,7 @@ class ProfilesettingsAction extends AccountSettingsAction
if (!common_valid_profile_tag($tag)) {
// TRANS: Validation error in form for profile settings.
// TRANS: %s is an invalid tag.
$this->showForm(sprintf(_('Invalid tag: "%s"'), $tag));
$this->showForm(sprintf(_('Invalid tag: "%s".'), $tag));
return;
}
}
......
actions/recoverpassword.php
View file @ a159352b
......@@ -226,7 +226,7 @@ class RecoverpasswordAction extends Action
// TRANS: Title for password recovery page in email sent mode.
case 'sent': return _('Password recovery requested');
// TRANS: Title for password recovery page in password saved mode.
case 'saved': return _('Password saved.');
case 'saved': return _('Password saved');
default:
// TRANS: Title for password recovery page when an unknown action has been specified.
return _('Unknown action');
......
actions/register.php
View file @ a159352b
......@@ -40,25 +40,21 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
class RegisterAction extends Action
{
/**
* Has there been an error?
*/
var $error = null;
/**
* Have we registered?
*/
var $registered = false;
/**
* Are we processing an invite?
*/
var $invite = null;
/**
......@@ -68,7 +64,6 @@ class RegisterAction extends Action
* @param $args
* @return string title
*/
function prepare($args)
{
parent::prepare($args);
......@@ -112,7 +107,6 @@ class RegisterAction extends Action
*
* @return string title
*/
function title()
{
if ($this->registered) {
......@@ -133,7 +127,6 @@ class RegisterAction extends Action
*
* @return void
*/
function handle($args)
{
parent::handle($args);
......@@ -163,7 +156,6 @@ class RegisterAction extends Action
*
* @return void
*/
function tryRegister()
{
if (Event::handle('StartRegistrationTry', array($this))) {
......@@ -206,7 +198,7 @@ class RegisterAction extends Action
$email = common_canonical_email($email);
if (!$this->boolean('license')) {
$this->showForm(_('You can\'t register if you don\'t '.
$this->showForm(_('You cannot register if you don\'t '.
'agree to the license.'));
} else if ($email && !Validate::email($email, common_config('email', 'check_domain'))) {
$this->showForm(_('Not a valid email address.'));
......@@ -284,7 +276,6 @@ class RegisterAction extends Action
*
* @return boolean true if the nickname already exists
*/
function nicknameExists($nickname)
{
$user = User::staticGet('nickname', $nickname);
......@@ -300,7 +291,6 @@ class RegisterAction extends Action
*
* @return boolean true if the address already exists
*/
function emailExists($email)
{
$email = common_canonical_email($email);
......@@ -339,7 +329,6 @@ class RegisterAction extends Action
*
* @return void
*/
function showPageNotice()
{
if ($this->registered) {
......@@ -351,7 +340,7 @@ class RegisterAction extends Action
common_markup_to_html(_('With this form you can create '.
'a new account. ' .
'You can then post notices and '.
'link up to friends and colleagues. '));
'link up to friends and colleagues.'));
$this->elementStart('div', 'instructions');
$this->raw($instr);
......@@ -368,7 +357,6 @@ class RegisterAction extends Action
*
* @return void
*/
function showForm($error=null)
{