summaryrefslogtreecommitdiff
path: root/actions
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
parent76b0e6e6f4151235d5032d1aa90f0937b415bd87 (diff)
parentaa0d9a86152d2485de6de5ec572ae87085ebe780 (diff)
Merge branch '0.9.x' into adminpanel
Diffstat (limited to 'actions')
-rw-r--r--actions/all.php2
-rw-r--r--actions/allrss.php2
-rw-r--r--actions/apiaccountratelimitstatus.php2
-rw-r--r--actions/apiaccountupdateprofileimage.php2
-rw-r--r--actions/apiblockcreate.php2
-rw-r--r--actions/apiblockdestroy.php2
-rw-r--r--actions/apidirectmessage.php2
-rw-r--r--actions/apidirectmessagenew.php2
-rw-r--r--actions/apifriendshipsdestroy.php2
-rw-r--r--actions/apigroupcreate.php2
-rw-r--r--actions/apigroupismember.php2
-rw-r--r--actions/apigroupjoin.php2
-rw-r--r--actions/apigroupleave.php2
-rw-r--r--actions/apigrouplist.php2
-rw-r--r--actions/apistatusesupdate.php2
-rw-r--r--actions/apisubscriptions.php2
-rw-r--r--actions/apitimelinefavorites.php2
-rw-r--r--actions/apitimelinefriends.php2
-rw-r--r--actions/apitimelinementions.php2
-rw-r--r--actions/apitimelineuser.php2
-rw-r--r--actions/attachment.php4
-rw-r--r--actions/avatarbynickname.php2
-rw-r--r--actions/foaf.php4
-rw-r--r--actions/groupblock.php2
-rw-r--r--actions/groups.php7
-rw-r--r--actions/imsettings.php8
-rw-r--r--actions/invite.php10
-rw-r--r--actions/login.php2
-rw-r--r--actions/logout.php2
-rw-r--r--actions/microsummary.php2
-rw-r--r--actions/newmessage.php4
-rw-r--r--actions/newnotice.php2
-rw-r--r--actions/noticesearch.php2
-rw-r--r--actions/opensearch.php4
-rw-r--r--actions/passwordsettings.php2
-rw-r--r--actions/peoplesearch.php2
-rw-r--r--actions/peopletag.php2
-rw-r--r--actions/profilesettings.php4
-rw-r--r--actions/register.php12
-rw-r--r--actions/remotesubscribe.php2
-rw-r--r--actions/replies.php4
-rw-r--r--actions/showgroup.php2
-rw-r--r--actions/showmessage.php8
-rw-r--r--actions/shownotice.php6
-rw-r--r--actions/showstream.php2
-rw-r--r--actions/smssettings.php2
-rw-r--r--actions/subscribers.php8
-rw-r--r--actions/subscriptions.php10
-rw-r--r--actions/sup.php2
-rw-r--r--actions/tagother.php2
-rw-r--r--actions/twitapisearchatom.php2
-rw-r--r--actions/twitapitrends.php2
52 files changed, 84 insertions, 85 deletions
diff --git a/actions/all.php b/actions/all.php
index b0fd8ee77..61cedce74 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -129,7 +129,7 @@ class AllAction extends ProfileAction
if (common_logged_in()) {
$current_user = common_current_user();
if ($this->user->id === $current_user->id) {
- $message .= _('Try subscribing to more users, [join a group](%%action.groups%%) or post something yourself.');
+ $message .= _('Try subscribing to more people, [join a group](%%action.groups%%) or post something yourself.');
} else {
$message .= sprintf(_('You can try to [nudge %s](../%s) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
}
diff --git a/actions/allrss.php b/actions/allrss.php
index 28b1be27d..4a5d15c7b 100644
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -56,7 +56,7 @@ class AllrssAction extends Rss10Action
*
* @param array $args Web and URL arguments
*
- * @return boolean false if user doesn't exist
+ * @return boolean false if user does not exist
*/
function prepare($args)
{
diff --git a/actions/apiaccountratelimitstatus.php b/actions/apiaccountratelimitstatus.php
index 96179f175..c7c0e7c00 100644
--- a/actions/apiaccountratelimitstatus.php
+++ b/actions/apiaccountratelimitstatus.php
@@ -36,7 +36,7 @@ if (!defined('STATUSNET')) {
require_once INSTALLDIR . '/lib/apibareauth.php';
/**
- * We don't have a rate limit, but some clients check this method.
+ * We do not have a rate limit, but some clients check this method.
* It always returns the same thing: 150 hits left.
*
* @category API
diff --git a/actions/apiaccountupdateprofileimage.php b/actions/apiaccountupdateprofileimage.php
index 72fb361bf..2f8e9628c 100644
--- a/actions/apiaccountupdateprofileimage.php
+++ b/actions/apiaccountupdateprofileimage.php
@@ -102,7 +102,7 @@ class ApiAccountUpdateProfileImageAction extends ApiAuthAction
}
if (empty($this->user)) {
- $this->clientError(_('No such user!'), 404, $this->format);
+ $this->clientError(_('No such user.'), 404, $this->format);
return;
}
diff --git a/actions/apiblockcreate.php b/actions/apiblockcreate.php
index 1cab2df5d..4f941f6c3 100644
--- a/actions/apiblockcreate.php
+++ b/actions/apiblockcreate.php
@@ -94,7 +94,7 @@ class ApiBlockCreateAction extends ApiAuthAction
}
if (empty($this->user) || empty($this->other)) {
- $this->clientError(_('No such user!'), 404, $this->format);
+ $this->clientError(_('No such user.'), 404, $this->format);
return;
}
diff --git a/actions/apiblockdestroy.php b/actions/apiblockdestroy.php
index 16dbf94ca..328f18ab0 100644
--- a/actions/apiblockdestroy.php
+++ b/actions/apiblockdestroy.php
@@ -93,7 +93,7 @@ class ApiBlockDestroyAction extends ApiAuthAction
}
if (empty($this->user) || empty($this->other)) {
- $this->clientError(_('No such user!'), 404, $this->format);
+ $this->clientError(_('No such user.'), 404, $this->format);
return;
}
diff --git a/actions/apidirectmessage.php b/actions/apidirectmessage.php
index a21fe86d2..5b3f412ad 100644
--- a/actions/apidirectmessage.php
+++ b/actions/apidirectmessage.php
@@ -74,7 +74,7 @@ class ApiDirectMessageAction extends ApiAuthAction
$this->user = $this->auth_user;
if (empty($this->user)) {
- $this->clientError(_('No such user!'), 404, $this->format);
+ $this->clientError(_('No such user.'), 404, $this->format);
return;
}
diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php
index ca1ee70dd..fed6acc30 100644
--- a/actions/apidirectmessagenew.php
+++ b/actions/apidirectmessagenew.php
@@ -72,7 +72,7 @@ class ApiDirectMessageNewAction extends ApiAuthAction
$this->user = $this->auth_user;
if (empty($this->user)) {
- $this->clientError(_('No such user!'), 404, $this->format);
+ $this->clientError(_('No such user.'), 404, $this->format);
return;
}
diff --git a/actions/apifriendshipsdestroy.php b/actions/apifriendshipsdestroy.php
index 3d9b7e001..fb73624c9 100644
--- a/actions/apifriendshipsdestroy.php
+++ b/actions/apifriendshipsdestroy.php
@@ -113,7 +113,7 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction
return;
}
- // Don't allow unsubscribing from yourself!
+ // Do not allow unsubscribing from yourself!
if ($this->user->id == $this->other->id) {
$this->clientError(
diff --git a/actions/apigroupcreate.php b/actions/apigroupcreate.php
index f66e83073..895dfb7ab 100644
--- a/actions/apigroupcreate.php
+++ b/actions/apigroupcreate.php
@@ -109,7 +109,7 @@ class ApiGroupCreateAction extends ApiAuthAction
}
if (empty($this->user)) {
- $this->clientError(_('No such user!'), 404, $this->format);
+ $this->clientError(_('No such user.'), 404, $this->format);
return;
}
diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php
index a8a40a6b3..a822d18dd 100644
--- a/actions/apigroupismember.php
+++ b/actions/apigroupismember.php
@@ -87,7 +87,7 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction
parent::handle($args);
if (empty($this->user)) {
- $this->clientError(_('No such user!'), 404, $this->format);
+ $this->clientError(_('No such user.'), 404, $this->format);
return;
}
diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php
index 071cd9290..ffda3986f 100644
--- a/actions/apigroupjoin.php
+++ b/actions/apigroupjoin.php
@@ -96,7 +96,7 @@ class ApiGroupJoinAction extends ApiAuthAction
}
if (empty($this->user)) {
- $this->clientError(_('No such user!'), 404, $this->format);
+ $this->clientError(_('No such user.'), 404, $this->format);
return;
}
diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php
index 0d4bb9e4d..8665ea1aa 100644
--- a/actions/apigroupleave.php
+++ b/actions/apigroupleave.php
@@ -96,7 +96,7 @@ class ApiGroupLeaveAction extends ApiAuthAction
}
if (empty($this->user)) {
- $this->clientError(_('No such user!'), 404, $this->format);
+ $this->clientError(_('No such user.'), 404, $this->format);
return;
}
diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php
index c529c1e40..7b05f8a96 100644
--- a/actions/apigrouplist.php
+++ b/actions/apigrouplist.php
@@ -87,7 +87,7 @@ class ApiGroupListAction extends ApiBareAuthAction
parent::handle($args);
if (empty($this->user)) {
- $this->clientError(_('No such user!'), 404, $this->format);
+ $this->clientError(_('No such user.'), 404, $this->format);
return;
}
diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index e369fa71e..5c23accca 100644
--- a/actions/apistatusesupdate.php
+++ b/actions/apistatusesupdate.php
@@ -136,7 +136,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction
}
if (empty($this->user)) {
- $this->clientError(_('No such user!'), 404, $this->format);
+ $this->clientError(_('No such user.'), 404, $this->format);
return;
}
diff --git a/actions/apisubscriptions.php b/actions/apisubscriptions.php
index bc68dd192..2c691bb84 100644
--- a/actions/apisubscriptions.php
+++ b/actions/apisubscriptions.php
@@ -84,7 +84,7 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
$this->user = $this->getTargetUser($this->arg('id'));
if (empty($this->user)) {
- $this->clientError(_('No such user!'), 404, $this->format);
+ $this->clientError(_('No such user.'), 404, $this->format);
return false;
}
diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php
index b8ae74f13..f84d7b4cb 100644
--- a/actions/apitimelinefavorites.php
+++ b/actions/apitimelinefavorites.php
@@ -67,7 +67,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
$this->user = $this->getTargetUser($this->arg('id'));
if (empty($this->user)) {
- $this->clientError(_('No such user!'), 404, $this->format);
+ $this->clientError(_('No such user.'), 404, $this->format);
return;
}
diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 66dd3f2b2..e84f77372 100644
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -76,7 +76,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
$this->user = $this->getTargetUser($this->arg('id'));
if (empty($this->user)) {
- $this->clientError(_('No such user!'), 404, $this->format);
+ $this->clientError(_('No such user.'), 404, $this->format);
return;
}
diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php
index fe5ff0f28..0956ccdce 100644
--- a/actions/apitimelinementions.php
+++ b/actions/apitimelinementions.php
@@ -76,7 +76,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
$this->user = $this->getTargetUser($this->arg('id'));
if (empty($this->user)) {
- $this->clientError(_('No such user!'), 404, $this->format);
+ $this->clientError(_('No such user.'), 404, $this->format);
return;
}
diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index 285735fd1..ca1d21772 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -78,7 +78,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
$this->user = $this->getTargetUser($this->arg('id'));
if (empty($this->user)) {
- $this->clientError(_('No such user!'), 404, $this->format);
+ $this->clientError(_('No such user.'), 404, $this->format);
return;
}
diff --git a/actions/attachment.php b/actions/attachment.php
index 6981354d1..ca9e57845 100644
--- a/actions/attachment.php
+++ b/actions/attachment.php
@@ -146,7 +146,7 @@ class AttachmentAction extends Action
}
/**
- * Don't show local navigation
+ * Do not show local navigation
*
* @return void
*/
@@ -170,7 +170,7 @@ class AttachmentAction extends Action
}
/**
- * Don't show page notice
+ * Do not show page notice
*
* @return void
*/
diff --git a/actions/avatarbynickname.php b/actions/avatarbynickname.php
index 537950792..1a6925e11 100644
--- a/actions/avatarbynickname.php
+++ b/actions/avatarbynickname.php
@@ -49,7 +49,7 @@ class AvatarbynicknameAction extends Action
*
* @param array $args query arguments
*
- * @return boolean false if nickname or user isn't found
+ * @return boolean false if nickname or user is not found
*/
function handle($args)
{
diff --git a/actions/foaf.php b/actions/foaf.php
index dd2747069..356393304 100644
--- a/actions/foaf.php
+++ b/actions/foaf.php
@@ -136,7 +136,7 @@ class FoafAction extends Action
$person = $this->showMicrobloggingAccount($this->profile,
common_root_url(), $this->user->uri, false);
- // Get users who subscribe to user
+ // Get people who subscribe to user
$sub = new Subscription();
$sub->subscribed = $this->profile->id;
@@ -250,7 +250,7 @@ class FoafAction extends Action
if ($isSubscriber) {
$this->element('sioc:follows', array('rdf:resource'=>$this->user->uri . '#acct'));
} else {
- // Get users user is subscribed to
+ // Get people user is subscribed to
$sub = new Subscription();
$sub->subscriber = $profile->id;
$sub->whereAdd('subscriber != subscribed');
diff --git a/actions/groupblock.php b/actions/groupblock.php
index 979a56a81..133101eb7 100644
--- a/actions/groupblock.php
+++ b/actions/groupblock.php
@@ -95,7 +95,7 @@ class GroupblockAction extends Action
$this->clientError(_('User is already blocked from group.'));
return false;
}
- // XXX: could have proactive blocks, but we don't have UI for it.
+ // XXX: could have proactive blocks, but we do not have UI for it.
if (!$this->profile->isMember($this->group)) {
$this->clientError(_('User is not a member of group.'));
return false;
diff --git a/actions/groups.php b/actions/groups.php
index c713d0a98..10a1d5964 100644
--- a/actions/groups.php
+++ b/actions/groups.php
@@ -88,12 +88,11 @@ class GroupsAction extends Action
{
$notice =
sprintf(_('%%%%site.name%%%% groups let you find and talk with ' .
- 'users of similar interests. After you join a group ' .
+ 'people of similar interests. After you join a group ' .
'you can send messages to all other members using the ' .
- 'syntax "!groupname". Are you not seeing any groups ' .
- 'you like? Try ' .
+ 'syntax "!groupname". Don\'t see a group you like? Try ' .
'[searching for one](%%%%action.groupsearch%%%%) or ' .
- '[start your own](%%%%action.newgroup%%%%)!'));
+ '[start your own!](%%%%action.newgroup%%%%)'));
$this->elementStart('div', 'instructions');
$this->raw(common_markup_to_html($notice));
$this->elementEnd('div');
diff --git a/actions/imsettings.php b/actions/imsettings.php
index 49c7b2a0e..f57933b43 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -69,7 +69,7 @@ class ImsettingsAction extends ConnectSettingsAction
{
return _('You can send and receive notices through '.
'Jabber/GTalk [instant messages](%%doc.im%%). '.
- 'Configure your instant messages address and settings below.');
+ 'Configure your address and settings below.');
}
/**
@@ -97,7 +97,7 @@ class ImsettingsAction extends ConnectSettingsAction
'action' =>
common_local_url('imsettings')));
$this->elementStart('fieldset', array('id' => 'settings_im_address'));
- $this->element('legend', null, _('IM address'));
+ $this->element('legend', null, _('Address'));
$this->hidden('token', common_session_token());
if ($user->jabber) {
@@ -111,7 +111,7 @@ class ImsettingsAction extends ConnectSettingsAction
if ($confirm) {
$this->element('p', 'form_unconfirmed', $confirm->address);
$this->element('p', 'form_note',
- sprintf(_('Awaiting confirmation on this IM address. '.
+ sprintf(_('Awaiting confirmation on this address. '.
'Check your Jabber/GTalk account for a '.
'message with further instructions. '.
'(Did you add %s to your buddy list?)'),
@@ -151,7 +151,7 @@ class ImsettingsAction extends ConnectSettingsAction
$this->elementStart('li');
$this->checkbox('jabberreplies',
_('Send me replies through Jabber/GTalk '.
- 'from users I am not subscribed to.'),
+ 'from people I\'m not subscribed to.'),
$user->jabberreplies);
$this->elementEnd('li');
$this->elementStart('li');
diff --git a/actions/invite.php b/actions/invite.php
index 8a0ac8a1b..3015202e9 100644
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -133,7 +133,7 @@ class InviteAction extends CurrentUserDesignAction
$this->elementEnd('ul');
}
if ($this->subbed) {
- $this->element('p', null, _('These are already users and you were automatically subscribed to them:'));
+ $this->element('p', null, _('These people are already users and you were automatically subscribed to them:'));
$this->elementStart('ul');
foreach ($this->subbed as $other) {
$this->element('li', null, sprintf(_('%s (%s)'), $other->nickname, $other->email));
@@ -141,7 +141,7 @@ class InviteAction extends CurrentUserDesignAction
$this->elementEnd('ul');
}
if ($this->sent) {
- $this->element('p', null, _('Invitation(s) sent to the following e-mail addresses:'));
+ $this->element('p', null, _('Invitation(s) sent to the following people:'));
$this->elementStart('ul');
foreach ($this->sent as $other) {
$this->element('li', null, $other);
@@ -226,9 +226,9 @@ class InviteAction extends CurrentUserDesignAction
$headers['Subject'] = sprintf(_('%1$s has invited you to join them on %2$s'), $bestname, $sitename);
$body = sprintf(_("%1\$s has invited you to join them on %2\$s (%3\$s).\n\n".
- "%2\$s is a micro-blogging service that lets you keep up-to-date with those you know and those who interest you.\n\n".
- "You can also share news about yourself, your thoughts, or your life online with users who know about you. ".
- "It is also great for meeting others who share your interests.\n\n".
+ "%2\$s is a micro-blogging service that lets you keep up-to-date with people you know and people who interest you.\n\n".
+ "You can also share news about yourself, your thoughts, or your life online with people who know about you. ".
+ "It's also great for meeting new people who share your interests.\n\n".
"%1\$s said:\n\n%4\$s\n\n".
"You can see %1\$s's profile page on %2\$s here:\n\n".
"%5\$s\n\n".
diff --git a/actions/login.php b/actions/login.php
index ad57dd667..679817520 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -159,7 +159,7 @@ class LoginAction extends Action
$url = common_get_returnto();
if ($url) {
- // We don't have to return to it again
+ // We do not have to return to it again
common_set_returnto(null);
} else {
$url = common_local_url('all',
diff --git a/actions/logout.php b/actions/logout.php
index 1e0adae57..7e768fca6 100644
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -81,7 +81,7 @@ class LogoutAction extends Action
{
common_set_user(null);
common_real_login(false); // not logged in
- common_forgetme(); // don't log back in!
+ common_forgetme(); // do not log back in!
}
}
diff --git a/actions/microsummary.php b/actions/microsummary.php
index 5c01a9ce0..5c761e8bb 100644
--- a/actions/microsummary.php
+++ b/actions/microsummary.php
@@ -59,7 +59,7 @@ class MicrosummaryAction extends Action
$user = User::staticGet('nickname', $nickname);
if (!$user) {
- $this->clientError(_('No such user'), 404);
+ $this->clientError(_('No such user.'), 404);
return;
}
diff --git a/actions/newmessage.php b/actions/newmessage.php
index 095a7d1d3..73307fdfc 100644
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -61,7 +61,7 @@ class NewmessageAction extends Action
/**
* Title of the page
*
- * Note that this usually doesn't get called unless something went wrong
+ * Note that this usually does not get called unless something went wrong
*
* @return string page title
*/
@@ -113,7 +113,7 @@ class NewmessageAction extends Action
$this->other = User::staticGet('id', $this->to);
if (!$this->other) {
- $this->clientError(_('No such user'), 404);
+ $this->clientError(_('No such user.'), 404);
return false;
}
diff --git a/actions/newnotice.php b/actions/newnotice.php
index fbd7ab6bc..fc06e5c98 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -59,7 +59,7 @@ class NewnoticeAction extends Action
/**
* Title of the page
*
- * Note that this usually doesn't get called unless something went wrong
+ * Note that this usually does not get called unless something went wrong
*
* @return string page title
*/
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index fe86c8cd3..79cf572cc 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -44,7 +44,7 @@ require_once INSTALLDIR.'/lib/searchaction.php';
* @author Robin Millette <millette@status.net>
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
* @link http://status.net/
- * @todo common parent for user and content search?
+ * @todo common parent for people and content search?
*/
class NoticesearchAction extends SearchAction
{
diff --git a/actions/opensearch.php b/actions/opensearch.php
index 8ebb5fc82..b205d2fe2 100644
--- a/actions/opensearch.php
+++ b/actions/opensearch.php
@@ -52,7 +52,7 @@ class OpensearchAction extends Action
*
* @param array $args query arguments
*
- * @return boolean false if user doesn't exist
+ * @return boolean false if user does not exist
*/
function handle($args)
{
@@ -61,7 +61,7 @@ class OpensearchAction extends Action
$short_name = '';
if ($type == 'people') {
$type = 'peoplesearch';
- $short_name = _('User Search');
+ $short_name = _('People Search');
} else {
$type = 'noticesearch';
$short_name = _('Notice Search');
diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index 87eb45a7d..6658d279f 100644
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -97,7 +97,7 @@ class PasswordsettingsAction extends AccountSettingsAction
$this->elementStart('ul', 'form_data');
- // Users who logged in with OpenID won't have a pwd
+ // Users who logged in with OpenID will not have a pwd
if ($user->password) {
$this->elementStart('li');
$this->password('oldpassword', _('Old password'));
diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php
index 63a5c88f3..38135ecbd 100644
--- a/actions/peoplesearch.php
+++ b/actions/peoplesearch.php
@@ -49,7 +49,7 @@ class PeoplesearchAction extends SearchAction
{
function getInstructions()
{
- return _('Search for users on %%site.name%% by their name, location, or interests. ' .
+ return _('Search for people on %%site.name%% by their name, location, or interests. ' .
'Separate the terms by spaces; they must be 3 characters or more.');
}
diff --git a/actions/peopletag.php b/actions/peopletag.php
index dbce417df..6dbbc9261 100644
--- a/actions/peopletag.php
+++ b/actions/peopletag.php
@@ -67,7 +67,7 @@ class PeopletagAction extends Action
$this->tag = $this->trimmed('tag');
if (!common_valid_profile_tag($this->tag)) {
- $this->clientError(sprintf(_('Not a valid user tag: %s'),
+ $this->clientError(sprintf(_('Not a valid people tag: %s'),
$this->tag));
return;
}
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 6a1c07f9d..0a0cc5997 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -68,8 +68,8 @@ class ProfilesettingsAction extends AccountSettingsAction
function getInstructions()
{
- return _('You can update your personal profile info here ' .
- 'so readers know more about you.');
+ return _('You can update your personal profile info here '.
+ 'so people know more about you.');
}
function showScripts()
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]'.
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index aee2a5d8e..74025cf80 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -151,7 +151,7 @@ class RemotesubscribeAction extends Action
$this->profile_url = $this->trimmed('profile_url');
if (!$this->profile_url) {
- $this->showForm(_('No such user'));
+ $this->showForm(_('No such user.'));
return;
}
diff --git a/actions/replies.php b/actions/replies.php
index 2829a7335..a13b5a227 100644
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -195,12 +195,12 @@ class RepliesAction extends OwnerDesignAction
function showEmptyListMessage()
{
- $message = sprintf(_('This is the timeline showing replies to %s but %s has not received a notice to his attention yet.'), $this->user->nickname, $this->user->nickname) . ' ';
+ $message = sprintf(_('This is the timeline showing replies to %s but %s hasn\'t received a notice to his attention yet.'), $this->user->nickname, $this->user->nickname) . ' ';
if (common_logged_in()) {
$current_user = common_current_user();
if ($this->user->id === $current_user->id) {
- $message .= _('You can engage other users in a conversation, subscribe to more users or [join groups](%%action.groups%%).');
+ $message .= _('You can engage other users in a conversation, subscribe to more people or [join groups](%%action.groups%%).');
} else {
$message .= sprintf(_('You can try to [nudge %s](../%s) or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
}
diff --git a/actions/showgroup.php b/actions/showgroup.php
index a4af29391..ae956befa 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -418,7 +418,7 @@ class ShowgroupAction extends GroupDesignAction
// XXX: WORM cache this
$members = $this->group->getMembers();
$members_count = 0;
- /** $member->count() doesn't work. */
+ /** $member->count() does not work. */
while ($members->fetch()) {
$members_count++;
}
diff --git a/actions/showmessage.php b/actions/showmessage.php
index db757948b..cf3a819c1 100644
--- a/actions/showmessage.php
+++ b/actions/showmessage.php
@@ -137,7 +137,7 @@ class ShowmessageAction extends MailboxAction
}
/**
- * Don't show local navigation
+ * Do not show local navigation
*
* @return void
*/
@@ -147,7 +147,7 @@ class ShowmessageAction extends MailboxAction
}
/**
- * Don't show page notice
+ * Do not show page notice
*
* @return void
*/
@@ -157,7 +157,7 @@ class ShowmessageAction extends MailboxAction
}
/**
- * Don't show aside
+ * Do not show aside
*
* @return void
*/
@@ -167,7 +167,7 @@ class ShowmessageAction extends MailboxAction
}
/**
- * Don't show any instructions
+ * Do not show any instructions
*
* @return string
*/
diff --git a/actions/shownotice.php b/actions/shownotice.php
index 5d16fdad9..688089f02 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -208,7 +208,7 @@ class ShownoticeAction extends OwnerDesignAction
}
/**
- * Don't show local navigation
+ * Do not show local navigation
*
* @return void
*/
@@ -234,7 +234,7 @@ class ShownoticeAction extends OwnerDesignAction
}
/**
- * Don't show page notice
+ * Do not show page notice
*
* @return void
*/
@@ -244,7 +244,7 @@ class ShownoticeAction extends OwnerDesignAction
}
/**
- * Don't show aside
+ * Do not show aside
*
* @return void
*/
diff --git a/actions/showstream.php b/actions/showstream.php
index 663638c18..4952ebdb7 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -253,7 +253,7 @@ class ShowstreamAction extends ProfileAction
}
}
-// We don't show the author for a profile, since we already know who it is!
+// We do not show the author for a profile, since we already know who it is!
class ProfileNoticeList extends NoticeList
{
diff --git a/actions/smssettings.php b/actions/smssettings.php
index 9fa7f62fb..672abcef8 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -101,7 +101,7 @@ class SmssettingsAction extends ConnectSettingsAction
common_local_url('smssettings')));
$this->elementStart('fieldset', array('id' => 'settings_sms_address'));
- $this->element('legend', null, _('SMS address'));
+ $this->element('legend', null, _('Address'));
$this->hidden('token', common_session_token());
if ($user->sms) {
diff --git a/actions/subscribers.php b/actions/subscribers.php
index 1f584e2c1..df9ec9961 100644
--- a/actions/subscribers.php
+++ b/actions/subscribers.php
@@ -60,12 +60,12 @@ class SubscribersAction extends GalleryAction
$user =& common_current_user();
if ($user && ($user->id == $this->profile->id)) {
$this->element('p', null,
- _('These are the users who have subscribed to '.
+ _('These are the people who listen to '.
'your notices.'));
} else {
$this->element('p', null,
- sprintf(_('These are the users who '.
- 'have subscribed to %s\'s notices.'),
+ sprintf(_('These are the people who '.
+ 'listen to %s\'s notices.'),
$this->profile->nickname));
}
}
@@ -105,7 +105,7 @@ class SubscribersAction extends GalleryAction
if (common_logged_in()) {
$current_user = common_current_user();
if ($this->user->id === $current_user->id) {
- $message = _('You have no subscribers. Try subscribing to users you know and they might return the favor');
+ $message = _('You have no subscribers. Try subscribing to people you know and they might return the favor');
} else {
$message = sprintf(_('%s has no subscribers. Want to be the first?'), $this->user->nickname);
}
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 4f65e9bf1..cc7b38ee4 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -62,12 +62,12 @@ class SubscriptionsAction extends GalleryAction
$user =& common_current_user();
if ($user && ($user->id == $this->profile->id)) {
$this->element('p', null,
- _('These are the users whose notices '.
- 'you have subscribed to.'));
+ _('These are the people whose notices '.
+ 'you listen to.'));
} else {
$this->element('p', null,
- sprintf(_('These are the users whose '.
- 'notices %s has subscribed to.'),
+ sprintf(_('These are the people whose '.
+ 'notices %s listens to.'),
$this->profile->nickname));
}
}
@@ -118,7 +118,7 @@ class SubscriptionsAction extends GalleryAction
if (common_logged_in()) {
$current_user = common_current_user();
if ($this->user->id === $current_user->id) {
- $message = _('You have not subscribed to anyone\'s notices right now. Try subscribing to users you know. Try [user search](%%action.peoplesearch%%), look for members in groups you\'re interested in and in our [featured users](%%action.featured%%). If you are a [Twitter user](%%action.twittersettings%%), you can automatically subscribe to users you already follow there.');
+ $message = _('You\'re not listening to anyone\'s notices right now, try subscribing to people you know. Try [people search](%%action.peoplesearch%%), look for members in groups you\'re interested in and in our [featured users](%%action.featured%%). If you\'re a [Twitter user](%%action.twittersettings%%), you can automatically subscribe to people you already follow there.');
} else {
$message = sprintf(_('%s is not listening to anyone.'), $this->user->nickname);
}
diff --git a/actions/sup.php b/actions/sup.php
index 5daf0a1c1..a199f247e 100644
--- a/actions/sup.php
+++ b/actions/sup.php
@@ -61,7 +61,7 @@ class SupAction extends Action
$notice = new Notice();
# XXX: cache this. Depends on how big this protocol becomes;
- # Re-doing this query every 15 seconds isn't the end of the world.
+ # Re-doing this query every 15 seconds is not the end of the world.
$divider = common_sql_date(time() - $seconds);
diff --git a/actions/tagother.php b/actions/tagother.php
index 80fa9cc95..c3f43be8b 100644
--- a/actions/tagother.php
+++ b/actions/tagother.php
@@ -190,7 +190,7 @@ class TagotherAction extends Action
!Subscription::pkeyGet(array('subscriber' => $this->profile->id,
'subscribed' => $user->id)))
{
- $this->clientError(_('You can only tag users you are subscribed to or who are subscribed to you.'));
+ $this->clientError(_('You can only tag people you are subscribed to or who are subscribed to you.'));
return;
}
diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php
index 7d618c471..511d7cdc6 100644
--- a/actions/twitapisearchatom.php
+++ b/actions/twitapisearchatom.php
@@ -250,7 +250,7 @@ class TwitapisearchatomAction extends ApiAction
}
// FIXME: this alternate link is not quite right because our
- // web-based notice search doesn't support a rpp (responses per
+ // web-based notice search does not support a rpp (responses per
// page) param yet
$this->element('link', array('type' => 'text/html',
diff --git a/actions/twitapitrends.php b/actions/twitapitrends.php
index 779405e6d..2d17e77cc 100644
--- a/actions/twitapitrends.php
+++ b/actions/twitapitrends.php
@@ -55,7 +55,7 @@ class TwitapitrendsAction extends ApiAction
*
* @param array $args Web and URL arguments
*
- * @return boolean false if user doesn't exist
+ * @return boolean false if user does not exist
*/
function prepare($args)
{