summaryrefslogtreecommitdiff
path: root/actions/register.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-11-08 21:41:43 -0500
committerEvan Prodromou <evan@status.net>2009-11-08 21:41:43 -0500
commit691beefd0f3755bab195279b1c0d7cc583942b72 (patch)
tree8c2e51f14d45759e57639ae90e999c192dcd0a17 /actions/register.php
parent76b0e6e6f4151235d5032d1aa90f0937b415bd87 (diff)
parentaa0d9a86152d2485de6de5ec572ae87085ebe780 (diff)
Merge branch '0.9.x' into adminpanel
Diffstat (limited to 'actions/register.php')
-rw-r--r--actions/register.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/actions/register.php b/actions/register.php
index 584ad3ead..c4f6760aa 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -82,14 +82,14 @@ class RegisterAction extends Action
}
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
@@ -174,7 +174,7 @@ class RegisterAction extends Action
$bio = $this->trimmed('bio');
$location = $this->trimmed('location');
- // We don't trim these... whitespace is OK in a password!
+ // We do not trim these... whitespace is OK in a password!
$password = $this->arg('password');
$confirm = $this->arg('confirm');
@@ -186,7 +186,7 @@ class RegisterAction extends Action
}
if (common_config('site', 'inviteonly') && !($code && $invite)) {
- $this->clientError(_('Sorry. Only those invited can register.'));
+ $this->clientError(_('Sorry, only invited people can register.'));
return;
}
@@ -401,7 +401,7 @@ class RegisterAction extends Action
}
if (common_config('site', 'inviteonly') && !($code && $invite)) {
- $this->clientError(_('Sorry. Only those invited can register.'));
+ $this->clientError(_('Sorry, only invited people can register.'));
return;
}
@@ -542,7 +542,7 @@ class RegisterAction extends Action
'(%%%%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]'.