git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

Commit 5ab709b7 authored by Siebrand Mazeland's avatar Siebrand Mazeland

Remove more contractions

* doesn't
* won't
* isn't
* don't
parent 104a47e4
...@@ -56,7 +56,7 @@ class AllrssAction extends Rss10Action ...@@ -56,7 +56,7 @@ class AllrssAction extends Rss10Action
* *
* @param array $args Web and URL arguments * @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) function prepare($args)
{ {
......
...@@ -36,7 +36,7 @@ if (!defined('STATUSNET')) { ...@@ -36,7 +36,7 @@ if (!defined('STATUSNET')) {
require_once INSTALLDIR . '/lib/apibareauth.php'; 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. * It always returns the same thing: 150 hits left.
* *
* @category API * @category API
......
...@@ -113,7 +113,7 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction ...@@ -113,7 +113,7 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction
return; return;
} }
// Don't allow unsubscribing from yourself! // Do not allow unsubscribing from yourself!
if ($this->user->id == $this->other->id) { if ($this->user->id == $this->other->id) {
$this->clientError( $this->clientError(
......
...@@ -146,7 +146,7 @@ class AttachmentAction extends Action ...@@ -146,7 +146,7 @@ class AttachmentAction extends Action
} }
/** /**
* Don't show local navigation * Do not show local navigation
* *
* @return void * @return void
*/ */
...@@ -170,7 +170,7 @@ class AttachmentAction extends Action ...@@ -170,7 +170,7 @@ class AttachmentAction extends Action
} }
/** /**
* Don't show page notice * Do not show page notice
* *
* @return void * @return void
*/ */
......
...@@ -49,7 +49,7 @@ class AvatarbynicknameAction extends Action ...@@ -49,7 +49,7 @@ class AvatarbynicknameAction extends Action
* *
* @param array $args query arguments * @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) function handle($args)
{ {
......
...@@ -95,7 +95,7 @@ class GroupblockAction extends Action ...@@ -95,7 +95,7 @@ class GroupblockAction extends Action
$this->clientError(_('User is already blocked from group.')); $this->clientError(_('User is already blocked from group.'));
return false; 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)) { if (!$this->profile->isMember($this->group)) {
$this->clientError(_('User is not a member of group.')); $this->clientError(_('User is not a member of group.'));
return false; return false;
......
...@@ -159,7 +159,7 @@ class LoginAction extends Action ...@@ -159,7 +159,7 @@ class LoginAction extends Action
$url = common_get_returnto(); $url = common_get_returnto();
if ($url) { if ($url) {
// We don't have to return to it again // We do not have to return to it again
common_set_returnto(null); common_set_returnto(null);
} else { } else {
$url = common_local_url('all', $url = common_local_url('all',
......
...@@ -81,7 +81,7 @@ class LogoutAction extends Action ...@@ -81,7 +81,7 @@ class LogoutAction extends Action
{ {
common_set_user(null); common_set_user(null);
common_real_login(false); // not logged in common_real_login(false); // not logged in
common_forgetme(); // don't log back in! common_forgetme(); // do not log back in!
} }
} }
...@@ -61,7 +61,7 @@ class NewmessageAction extends Action ...@@ -61,7 +61,7 @@ class NewmessageAction extends Action
/** /**
* Title of the page * 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 * @return string page title
*/ */
......
...@@ -59,7 +59,7 @@ class NewnoticeAction extends Action ...@@ -59,7 +59,7 @@ class NewnoticeAction extends Action
/** /**
* Title of the page * 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 * @return string page title
*/ */
......
...@@ -52,7 +52,7 @@ class OpensearchAction extends Action ...@@ -52,7 +52,7 @@ class OpensearchAction extends Action
* *
* @param array $args query arguments * @param array $args query arguments
* *
* @return boolean false if user doesn't exist * @return boolean false if user does not exist
*/ */
function handle($args) function handle($args)
{ {
......
...@@ -97,7 +97,7 @@ class PasswordsettingsAction extends AccountSettingsAction ...@@ -97,7 +97,7 @@ class PasswordsettingsAction extends AccountSettingsAction
$this->elementStart('ul', 'form_data'); $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) { if ($user->password) {
$this->elementStart('li'); $this->elementStart('li');
$this->password('oldpassword', _('Old password')); $this->password('oldpassword', _('Old password'));
......
...@@ -174,7 +174,7 @@ class RegisterAction extends Action ...@@ -174,7 +174,7 @@ class RegisterAction extends Action
$bio = $this->trimmed('bio'); $bio = $this->trimmed('bio');
$location = $this->trimmed('location'); $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'); $password = $this->arg('password');
$confirm = $this->arg('confirm'); $confirm = $this->arg('confirm');
......
...@@ -418,7 +418,7 @@ class ShowgroupAction extends GroupDesignAction ...@@ -418,7 +418,7 @@ class ShowgroupAction extends GroupDesignAction
// XXX: WORM cache this // XXX: WORM cache this
$members = $this->group->getMembers(); $members = $this->group->getMembers();
$members_count = 0; $members_count = 0;
/** $member->count() doesn't work. */ /** $member->count() does not work. */
while ($members->fetch()) { while ($members->fetch()) {
$members_count++; $members_count++;
} }
......
...@@ -137,7 +137,7 @@ class ShowmessageAction extends MailboxAction ...@@ -137,7 +137,7 @@ class ShowmessageAction extends MailboxAction
} }
/** /**
* Don't show local navigation * Do not show local navigation
* *
* @return void * @return void
*/ */
...@@ -147,7 +147,7 @@ class ShowmessageAction extends MailboxAction ...@@ -147,7 +147,7 @@ class ShowmessageAction extends MailboxAction
} }
/** /**
* Don't show page notice * Do not show page notice
* *
* @return void * @return void
*/ */
...@@ -157,7 +157,7 @@ class ShowmessageAction extends MailboxAction ...@@ -157,7 +157,7 @@ class ShowmessageAction extends MailboxAction
} }
/** /**
* Don't show aside * Do not show aside
* *
* @return void * @return void
*/ */
...@@ -167,7 +167,7 @@ class ShowmessageAction extends MailboxAction ...@@ -167,7 +167,7 @@ class ShowmessageAction extends MailboxAction
} }
/** /**
* Don't show any instructions * Do not show any instructions
* *
* @return string * @return string
*/ */
......
...@@ -208,7 +208,7 @@ class ShownoticeAction extends OwnerDesignAction ...@@ -208,7 +208,7 @@ class ShownoticeAction extends OwnerDesignAction
} }
/** /**
* Don't show local navigation * Do not show local navigation
* *
* @return void * @return void
*/ */
...@@ -234,7 +234,7 @@ class ShownoticeAction extends OwnerDesignAction ...@@ -234,7 +234,7 @@ class ShownoticeAction extends OwnerDesignAction
} }
/** /**
* Don't show page notice * Do not show page notice
* *
* @return void * @return void
*/ */
...@@ -244,7 +244,7 @@ class ShownoticeAction extends OwnerDesignAction ...@@ -244,7 +244,7 @@ class ShownoticeAction extends OwnerDesignAction
} }
/** /**
* Don't show aside * Do not show aside
* *
* @return void * @return void
*/ */
......
...@@ -253,7 +253,7 @@ class ShowstreamAction extends ProfileAction ...@@ -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 class ProfileNoticeList extends NoticeList
{ {
......
...@@ -61,7 +61,7 @@ class SupAction extends Action ...@@ -61,7 +61,7 @@ class SupAction extends Action
$notice = new Notice(); $notice = new Notice();
# XXX: cache this. Depends on how big this protocol becomes; # 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); $divider = common_sql_date(time() - $seconds);
......
...@@ -250,7 +250,7 @@ class TwitapisearchatomAction extends ApiAction ...@@ -250,7 +250,7 @@ class TwitapisearchatomAction extends ApiAction
} }
// FIXME: this alternate link is not quite right because our // 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 // page) param yet
$this->element('link', array('type' => 'text/html', $this->element('link', array('type' => 'text/html',
......
...@@ -55,7 +55,7 @@ class TwitapitrendsAction extends ApiAction ...@@ -55,7 +55,7 @@ class TwitapitrendsAction extends ApiAction
* *
* @param array $args Web and URL arguments * @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) function prepare($args)
{ {
......
...@@ -53,7 +53,7 @@ class File_redirection extends Memcached_DataObject ...@@ -53,7 +53,7 @@ class File_redirection extends Memcached_DataObject
'connect_timeout' => 10, // # seconds to wait 'connect_timeout' => 10, // # seconds to wait
'max_redirs' => $redirs, // # max number of http redirections to follow 'max_redirs' => $redirs, // # max number of http redirections to follow
'follow_redirects' => true, // Follow redirects 'follow_redirects' => true, // Follow redirects
'store_body' => false, // We won't need body content here. 'store_body' => false, // We will not need body content here.
)); ));
return $request; return $request;
} }
...@@ -81,12 +81,12 @@ class File_redirection extends Memcached_DataObject ...@@ -81,12 +81,12 @@ class File_redirection extends Memcached_DataObject
} }
try { try {
$request = self::_commonHttp($short_url, $redirs); $request = self::_commonHttp($short_url, $redirs);
// Don't include body in output // Do not include body in output
$request->setMethod(HTTP_Request2::METHOD_HEAD); $request->setMethod(HTTP_Request2::METHOD_HEAD);
$response = $request->send(); $response = $request->send();
if (405 == $response->getStatus()) { if (405 == $response->getStatus()) {
// Server doesn't support HEAD method? Can this really happen? // Server does not support HEAD method? Can this really happen?
// We'll try again as a GET and ignore the response data. // We'll try again as a GET and ignore the response data.
$request = self::_commonHttp($short_url, $redirs); $request = self::_commonHttp($short_url, $redirs);
$response = $request->send(); $response = $request->send();
...@@ -178,7 +178,7 @@ class File_redirection extends Memcached_DataObject ...@@ -178,7 +178,7 @@ class File_redirection extends Memcached_DataObject
case 'aim': case 'aim':
case 'jabber': case 'jabber':
case 'xmpp': case 'xmpp':
// don't touch anything // do not touch anything
break; break;
default: default:
......
...@@ -146,7 +146,7 @@ class Notice extends Memcached_DataObject ...@@ -146,7 +146,7 @@ class Notice extends Memcached_DataObject
/* Add them to the database */ /* Add them to the database */
foreach(array_unique($hashtags) as $hashtag) { foreach(array_unique($hashtags) as $hashtag) {
/* elide characters we don't want in the tag */ /* elide characters we do not want in the tag */
$this->saveTag($hashtag); $this->saveTag($hashtag);
} }
return true; return true;
...@@ -1105,7 +1105,7 @@ class Notice extends Memcached_DataObject ...@@ -1105,7 +1105,7 @@ class Notice extends Memcached_DataObject
if (empty($recipient)) { if (empty($recipient)) {
continue; continue;
} }
// Don't save replies from blocked profile to local user // Do not save replies from blocked profile to local user
$recipient_user = User::staticGet('id', $recipient->id); $recipient_user = User::staticGet('id', $recipient->id);
if (!empty($recipient_user) && $recipient_user->hasBlocked($sender)) { if (!empty($recipient_user) && $recipient_user->hasBlocked($sender)) {
continue; continue;
...@@ -1131,7 +1131,7 @@ class Notice extends Memcached_DataObject ...@@ -1131,7 +1131,7 @@ class Notice extends Memcached_DataObject
$tagged = Profile_tag::getTagged($sender->id, $tag); $tagged = Profile_tag::getTagged($sender->id, $tag);
foreach ($tagged as $t) { foreach ($tagged as $t) {
if (!$replied[$t->id]) { if (!$replied[$t->id]) {
// Don't save replies from blocked profile to local user // Do not save replies from blocked profile to local user
$t_user = User::staticGet('id', $t->id); $t_user = User::staticGet('id', $t->id);
if ($t_user && $t_user->hasBlocked($sender)) { if ($t_user && $t_user->hasBlocked($sender)) {
continue; continue;
......
...@@ -101,7 +101,7 @@ class Profile extends Memcached_DataObject ...@@ -101,7 +101,7 @@ class Profile extends Memcached_DataObject
} }
foreach (array(AVATAR_PROFILE_SIZE, AVATAR_STREAM_SIZE, AVATAR_MINI_SIZE) as $size) { foreach (array(AVATAR_PROFILE_SIZE, AVATAR_STREAM_SIZE, AVATAR_MINI_SIZE) as $size) {
# We don't do a scaled one if original is our scaled size # We do not do a scaled one if original is our scaled size
if (!($avatar->width == $size && $avatar->height == $size)) { if (!($avatar->width == $size && $avatar->height == $size)) {
$scaled_filename = $imagefile->resize($size); $scaled_filename = $imagefile->resize($size);
...@@ -174,7 +174,7 @@ class Profile extends Memcached_DataObject ...@@ -174,7 +174,7 @@ class Profile extends Memcached_DataObject
function getNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0, $since=null) function getNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0, $since=null)
{ {
// XXX: I'm not sure this is going to be any faster. It probably isn't. // XXX: I'm not sure this is going to be any faster. It probably is not.
$ids = Notice::stream(array($this, '_streamDirect'), $ids = Notice::stream(array($this, '_streamDirect'),
array(), array(),
'profile:notice_ids:' . $this->id, 'profile:notice_ids:' . $this->id,
......
...@@ -87,7 +87,7 @@ class User extends Memcached_DataObject ...@@ -87,7 +87,7 @@ class User extends Memcached_DataObject
return (is_null($sub)) ? false : true; return (is_null($sub)) ? false : true;
} }
// 'update' won't write key columns, so we have to do it ourselves. // 'update' will not write key columns, so we have to do it ourselves.
function updateKeys(&$orig) function updateKeys(&$orig)
{ {
...@@ -384,7 +384,7 @@ class User extends Memcached_DataObject ...@@ -384,7 +384,7 @@ class User extends Memcached_DataObject
return false; return false;
} }
// Otherwise, cache doesn't have all faves; // Otherwise, cache does not have all faves;
// fall through to the default // fall through to the default
} }
...@@ -463,7 +463,7 @@ class User extends Memcached_DataObject ...@@ -463,7 +463,7 @@ class User extends Memcached_DataObject
{ {
$cache = common_memcache(); $cache = common_memcache();
if ($cache) { if ($cache) {
// Faves don't happen chronologically, so we need to blow // Faves do not happen chronologically, so we need to blow
// ;last cache, too // ;last cache, too
$cache->delete(common_cache_key('fave:ids_by_user:'.$this->id)); $cache->delete(common_cache_key('fave:ids_by_user:'.$this->id));
$cache->delete(common_cache_key('fave:ids_by_user:'.$this->id.';last')); $cache->delete(common_cache_key('fave:ids_by_user:'.$this->id.';last'));
......
...@@ -66,7 +66,7 @@ class ApiAction extends Action ...@@ -66,7 +66,7 @@ class ApiAction extends Action
* *
* @param array $args Web and URL arguments * @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) function prepare($args)
...@@ -138,7 +138,7 @@ class ApiAction extends Action ...@@ -138,7 +138,7 @@ class ApiAction extends Action
$design = null; $design = null;
$user = $profile->getUser(); $user = $profile->getUser();
// Note: some profiles don't have an associated user // Note: some profiles do not have an associated user
if (!empty($user)) { if (!empty($user)) {
$design = $user->getDesign(); $design = $user->getDesign();
...@@ -203,7 +203,7 @@ class ApiAction extends Action ...@@ -203,7 +203,7 @@ class ApiAction extends Action
if ($get_notice) { if ($get_notice) {
$notice = $profile->getCurrentNotice(); $notice = $profile->getCurrentNotice();
if ($notice) { if ($notice) {
# don't get user! # do not get user!
$twitter_user['status'] = $this->twitterStatusArray($notice, false); $twitter_user['status'] = $this->twitterStatusArray($notice, false);
} }
} }
...@@ -263,7 +263,7 @@ class ApiAction extends Action ...@@ -263,7 +263,7 @@ class ApiAction extends Action
} }
if ($include_user) { if ($include_user) {
# Don't get notice (recursive!) # Do not get notice (recursive!)
$twitter_user = $this->twitterUserArray($profile, false); $twitter_user = $this->twitterUserArray($profile, false);
$twitter_status['user'] = $twitter_user; $twitter_status['user'] = $twitter_user;
} }
...@@ -1074,7 +1074,7 @@ class ApiAction extends Action ...@@ -1074,7 +1074,7 @@ class ApiAction extends Action
function initTwitterAtom() function initTwitterAtom()
{ {
$this->startXML(); $this->startXML();
// FIXME: don't hardcode the language here! // FIXME: do not hardcode the language here!
$this->elementStart('feed', array('xmlns' => 'http://www.w3.org/2005/Atom', $this->elementStart('feed', array('xmlns' => 'http://www.w3.org/2005/Atom',
'xml:lang' => 'en-US', 'xml:lang' => 'en-US',
'xmlns:thr' => 'http://purl.org/syndication/thread/1.0')); 'xmlns:thr' => 'http://purl.org/syndication/thread/1.0'));
...@@ -1116,7 +1116,7 @@ class ApiAction extends Action ...@@ -1116,7 +1116,7 @@ class ApiAction extends Action
return User::staticGet('nickname', $nickname); return User::staticGet('nickname', $nickname);
} else if ($this->arg('user_id')) { } else if ($this->arg('user_id')) {
// This is to ensure that a non-numeric user_id still // This is to ensure that a non-numeric user_id still
// overrides screen_name even if it doesn't get used // overrides screen_name even if it does not get used
if (is_numeric($this->arg('user_id'))) { if (is_numeric($this->arg('user_id'))) {
return User::staticGet('id', $this->arg('user_id')); return User::staticGet('id', $this->arg('user_id'));
} }
...@@ -1146,7 +1146,7 @@ class ApiAction extends Action ...@@ -1146,7 +1146,7 @@ class ApiAction extends Action
return User_group::staticGet('nickname', $nickname); return User_group::staticGet('nickname', $nickname);
} else if ($this->arg('group_id')) { } else if ($this->arg('group_id')) {
// This is to ensure that a non-numeric user_id still // This is to ensure that a non-numeric user_id still
// overrides screen_name even if it doesn't get used // overrides screen_name even if it does not get used
if (is_numeric($this->arg('group_id'))) { if (is_numeric($this->arg('group_id'))) {
return User_group::staticGet('id', $this->arg('group_id')); return User_group::staticGet('id', $this->arg('group_id'));
} }
......
...@@ -87,7 +87,7 @@ class ApiAuthAction extends ApiAction ...@@ -87,7 +87,7 @@ class ApiAuthAction extends ApiAction
} }
/** /**
* Check for a user specified via HTTP basic auth. If there isn't * Check for a user specified via HTTP basic auth. If there is not
* one, try to get one by outputting the basic auth header. * one, try to get one by outputting the basic auth header.
* *
* @return boolean true or false * @return boolean true or false
......
...@@ -39,7 +39,7 @@ require_once INSTALLDIR.'/lib/servererroraction.php'; ...@@ -39,7 +39,7 @@ require_once INSTALLDIR.'/lib/servererroraction.php';
* *
* This only occurs if there's been a DB_DataObject_Error that's * This only occurs if there's been a DB_DataObject_Error that's
* reported through PEAR, so we try to avoid doing anything that connects * reported through PEAR, so we try to avoid doing anything that connects
* to the DB, so we don't trigger it again. * to the DB, so we do not trigger it again.
* *
* @category Action * @category Action
* @package StatusNet * @package StatusNet
...@@ -62,12 +62,12 @@ class DBErrorAction extends ServerErrorAction ...@@ -62,12 +62,12 @@ class DBErrorAction extends ServerErrorAction
function getLanguage() function getLanguage()
{ {
// Don't try to figure out user's language; just show the page // Do not try to figure out user's language; just show the page
return common_config('site', 'language'); return common_config('site', 'language');
} }
function showPrimaryNav() function showPrimaryNav()
{ {
// don't show primary nav // do not show primary nav
} }
} }
...@@ -104,11 +104,11 @@ class ErrorAction extends Action ...@@ -104,11 +104,11 @@ class ErrorAction extends Action
{ {
parent::showPage(); parent::showPage();
// We don't want to have any more output after this // We do not want to have any more output after this
exit(); exit();
} }
// Overload a bunch of stuff so the page isn't too bloated // Overload a bunch of stuff so the page is not too bloated
function showBody() function showBody()
{ {
......
...@@ -76,7 +76,7 @@ class HTMLOutputter extends XMLOutputter ...@@ -76,7 +76,7 @@ class HTMLOutputter extends XMLOutputter
/** /**
* Start an HTML document * Start an HTML document
* *
* If $type isn't specified, will attempt to do content negotiation. * If $type is not specified, will attempt to do content negotiation.
* *
* Attempts to do content negotiation for language, also. * Attempts to do content negotiation for language, also.
* *
......
...@@ -119,7 +119,7 @@ class ImageFile ...@@ -119,7 +119,7 @@ class ImageFile
return; return;
} }
// Don't crop/scale if it isn't necessary // Do not crop/scale if it is not necessary
if ($size === $this->width if ($size === $this->width
&& $size === $this->height && $size === $this->height
&& $x === 0 && $x === 0
......
...@@ -437,7 +437,7 @@ function jabber_public_notice($notice) ...@@ -437,7 +437,7 @@ function jabber_public_notice($notice)
$public = common_config('xmpp', 'public'); $public = common_config('xmpp', 'public');
// FIXME PRIV don't send out private messages here // FIXME PRIV do not send out private messages here
// XXX: should we send out non-local messages if public,localonly // XXX: should we send out non-local messages if public,localonly
// = false? I think not // = false? I think not
......
...@@ -467,7 +467,7 @@ function mail_notify_nudge($from, $to) ...@@ -467,7 +467,7 @@ function mail_notify_nudge($from, $to)
"these days and is inviting you to post some news.\n\n". "these days and is inviting you to post some news.\n\n".