summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorSiebrand Mazeland <s.mazeland@xs4all.nl>2009-11-08 23:32:15 +0100
committerSiebrand Mazeland <s.mazeland@xs4all.nl>2009-11-08 23:32:15 +0100
commit5ab709b73977131813884558bf56d97172a7aa26 (patch)
tree2015f93426f559514bdb697b391ea97f98858577 /actions
parent104a47e4a2903f1c7ea73363a73cee12f0cf14ac (diff)
Remove more contractions
* doesn't * won't * isn't * don't
Diffstat (limited to 'actions')
-rw-r--r--actions/allrss.php2
-rw-r--r--actions/apiaccountratelimitstatus.php2
-rw-r--r--actions/apifriendshipsdestroy.php2
-rw-r--r--actions/attachment.php4
-rw-r--r--actions/avatarbynickname.php2
-rw-r--r--actions/groupblock.php2
-rw-r--r--actions/login.php2
-rw-r--r--actions/logout.php2
-rw-r--r--actions/newmessage.php2
-rw-r--r--actions/newnotice.php2
-rw-r--r--actions/opensearch.php2
-rw-r--r--actions/passwordsettings.php2
-rw-r--r--actions/register.php2
-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/sup.php2
-rw-r--r--actions/twitapisearchatom.php2
-rw-r--r--actions/twitapitrends.php2
20 files changed, 26 insertions, 26 deletions
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/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/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/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/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/newmessage.php b/actions/newmessage.php
index 0db2e7181..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
*/
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/opensearch.php b/actions/opensearch.php
index 8ebb5fc82..3136380b0 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)
{
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/register.php b/actions/register.php
index 584ad3ead..69c50faca 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -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');
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/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/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)
{