Remove more contractions

* doesn't
* won't
* isn't
* don't

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)
     {

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

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(

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
      */

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)
     {

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;

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',

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!
     }
 
 }

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
      */

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
      */

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)
     {

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'));

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');
 

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++;
         }

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
      */

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
      */

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
 {

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);
 

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',

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)
     {

classes/File_redirection.php

@@ -53,7 +53,7 @@ class File_redirection extends Memcached_DataObject
             'connect_timeout' => 10, // # seconds to wait
             'max_redirs' => $redirs, // # max number of http redirections to follow
             '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;
     }
@@ -81,12 +81,12 @@ class File_redirection extends Memcached_DataObject
         }
         try {
             $request = self::_commonHttp($short_url, $redirs);
-            // Don't include body in output
+            // Do not include body in output
             $request->setMethod(HTTP_Request2::METHOD_HEAD);
             $response = $request->send();
 
             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.
                 $request = self::_commonHttp($short_url, $redirs);
                 $response = $request->send();
@@ -178,7 +178,7 @@ class File_redirection extends Memcached_DataObject
             case 'aim':
             case 'jabber':
             case 'xmpp':
-                // don't touch anything
+                // do not touch anything
                 break;
 
             default:

classes/Notice.php

@@ -146,7 +146,7 @@ class Notice extends Memcached_DataObject
 
         /* Add them to the database */
         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);
         }
         return true;
@@ -1105,7 +1105,7 @@ class Notice extends Memcached_DataObject
             if (empty($recipient)) {
                 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);
             if (!empty($recipient_user) && $recipient_user->hasBlocked($sender)) {
                 continue;
@@ -1131,7 +1131,7 @@ class Notice extends Memcached_DataObject
                 $tagged = Profile_tag::getTagged($sender->id, $tag);
                 foreach ($tagged as $t) {
                     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);
                         if ($t_user && $t_user->hasBlocked($sender)) {
                             continue;

classes/Profile.php

@@ -101,7 +101,7 @@ class Profile extends Memcached_DataObject
         }
 
         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)) {
 
                 $scaled_filename = $imagefile->resize($size);
@@ -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)
     {
-        // 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'),
                               array(),
                               'profile:notice_ids:' . $this->id,

classes/User.php

@@ -87,7 +87,7 @@ class User extends Memcached_DataObject
         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)
     {
@@ -384,7 +384,7 @@ class User extends Memcached_DataObject
                 return false;
             }
 
-            // Otherwise, cache doesn't have all faves;
+            // Otherwise, cache does not have all faves;
             // fall through to the default
         }
 
@@ -463,7 +463,7 @@ class User extends Memcached_DataObject
     {
         $cache = common_memcache();
         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
             $cache->delete(common_cache_key('fave:ids_by_user:'.$this->id));
             $cache->delete(common_cache_key('fave:ids_by_user:'.$this->id.';last'));

lib/api.php

@@ -66,7 +66,7 @@ class ApiAction extends Action
      *
      * @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)
@@ -138,7 +138,7 @@ class ApiAction extends Action
         $design        = null;
         $user          = $profile->getUser();
 
-        // Note: some profiles don't have an associated user
+        // Note: some profiles do not have an associated user
 
         if (!empty($user)) {
             $design = $user->getDesign();
@@ -203,7 +203,7 @@ class ApiAction extends Action
         if ($get_notice) {
             $notice = $profile->getCurrentNotice();
             if ($notice) {
-                # don't get user!
+                # do not get user!
                 $twitter_user['status'] = $this->twitterStatusArray($notice, false);
             }
         }
@@ -263,7 +263,7 @@ class ApiAction extends Action
         }
 
         if ($include_user) {
-            # Don't get notice (recursive!)
+            # Do not get notice (recursive!)
             $twitter_user = $this->twitterUserArray($profile, false);
             $twitter_status['user'] = $twitter_user;
         }
@@ -1074,7 +1074,7 @@ class ApiAction extends Action
     function initTwitterAtom()
     {
         $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',
                                           'xml:lang' => 'en-US',
                                           'xmlns:thr' => 'http://purl.org/syndication/thread/1.0'));
@@ -1116,7 +1116,7 @@ class ApiAction extends Action
                 return User::staticGet('nickname', $nickname);
             } else if ($this->arg('user_id')) {
                 // 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'))) {
                     return User::staticGet('id', $this->arg('user_id'));
                 }
@@ -1146,7 +1146,7 @@ class ApiAction extends Action
                 return User_group::staticGet('nickname', $nickname);
             } else if ($this->arg('group_id')) {
                 // 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'))) {
                     return User_group::staticGet('id', $this->arg('group_id'));
                 }

lib/apiauth.php

@@ -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.
      *
      * @return boolean true or false

lib/dberroraction.php

@@ -39,7 +39,7 @@ require_once INSTALLDIR.'/lib/servererroraction.php';
  *
  * 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
- * to the DB, so we don't trigger it again.
+ * to the DB, so we do not trigger it again.
  *
  * @category Action
  * @package  StatusNet
@@ -62,12 +62,12 @@ class DBErrorAction extends ServerErrorAction
 
     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');
     }
 
     function showPrimaryNav()
     {
-        // don't show primary nav
+        // do not show primary nav
     }
 }

lib/error.php

@@ -104,11 +104,11 @@ class ErrorAction extends Action
     {
         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();
     }
 
-    // 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()
     {

lib/htmloutputter.php

@@ -76,7 +76,7 @@ class HTMLOutputter extends XMLOutputter
     /**
      * 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.
      *

lib/imagefile.php

@@ -119,7 +119,7 @@ class ImageFile
             return;
         }
 
-        // Don't crop/scale if it isn't necessary
+        // Do not crop/scale if it is not necessary
         if ($size === $this->width
             && $size === $this->height
             && $x === 0

lib/jabber.php

@@ -437,7 +437,7 @@ function jabber_public_notice($notice)
 
     $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
     // = false? I think not
 

lib/mail.php

@@ -467,7 +467,7 @@ function mail_notify_nudge($from, $to)
                       "these days and is inviting you to post some news.\n\n".
                       "So let's hear from you :)\n\n".
                       "%3\$s\n\n".
-                      "Don't reply to this email; it won't get to them.\n\n".
+                      "Do not reply to this email. It will not get to them.\n\n".
                       "With kind regards,\n".
                       "%4\$s\n"),
                     $from_profile->getBestName(),
@@ -516,7 +516,7 @@ function mail_notify_message($message, $from=null, $to=null)
                       "------------------------------------------------------\n\n".
                       "You can reply to their message here:\n\n".
                       "%4\$s\n\n".
-                      "Don't reply to this email; it won't get to them.\n\n".
+                      "Do not reply to this email. It will not get to them.\n\n".
                       "With kind regards,\n".
                       "%5\$s\n"),
                     $from_profile->getBestName(),
@@ -532,7 +532,7 @@ function mail_notify_message($message, $from=null, $to=null)
 /**
  * notify a user that one of their notices has been chosen as a 'fave'
  *
- * Doesn't check that the user has an email address nor if they
+ * Does not check that the user has an email address nor if they
  * want to receive notification of faves. Maybe this happens higher
  * up the stack...?
  *

lib/noticelist.php

@@ -347,7 +347,7 @@ class NoticeListItem extends Widget
      * show the link to the main page for the notice
      *
      * Displays a link to the page for a notice, with "relative" time. Tries to
-     * get remote notice URLs correct, but doesn't always succeed.
+     * get remote notice URLs correct, but does not always succeed.
      *
      * @return void
      */
@@ -483,7 +483,7 @@ class NoticeListItem extends Widget
      * show a link to reply to the current notice
      *
      * Should either do the reply in the current notice form (if available), or
-     * link out to the notice-posting form. A little flakey, doesn't always work.
+     * link out to the notice-posting form. A little flakey, does not always work.
      *
      * @return void
      */

lib/queuehandler.php

@@ -96,8 +96,8 @@ class QueueHandler extends Daemon
      * Initialization, run when the queue handler starts.
      * If this function indicates failure, the handler run will be aborted.
      *
-     * @fixme run() will abort if this doesn't return true,
-     *        but some subclasses don't bother.
+     * @fixme run() will abort if this does not return true,
+     *        but some subclasses do not bother.
      * @return boolean true on success, false on failure
      */
     function start()
@@ -108,8 +108,8 @@ class QueueHandler extends Daemon
      * Cleanup, run when the queue handler ends.
      * If this function indicates failure, a warning will be logged.
      *
-     * @fixme run() will throw warnings if this doesn't return true,
-     *        but many subclasses don't bother.
+     * @fixme run() will throw warnings if this does not return true,
+     *        but many subclasses do not bother.
      * @return boolean true on success, false on failure
      */
     function finish()
@@ -137,7 +137,7 @@ class QueueHandler extends Daemon
      * method, which passes control back to our handle_notice() method for
      * each notice that comes in on the queue.
      *
-     * Most of the time this won't need to be overridden in a subclass.
+     * Most of the time this will not need to be overridden in a subclass.
      *
      * @return boolean true on success, false on failure
      */
@@ -173,7 +173,7 @@ class QueueHandler extends Daemon
      * Called by QueueHandler after each handled item or empty polling cycle.
      * This is a good time to e.g. service your XMPP connection.
      *
-     * Doesn't need to be overridden if there's no maintenance to do.
+     * Does not need to be overridden if there's no maintenance to do.
      *
      * @param int $timeout seconds to sleep if there's nothing to do
      */

lib/rssaction.php

@@ -386,7 +386,7 @@ class Rss10Action extends Action
             return null;
         }
 
-        // FIXME: doesn't handle modified profiles, avatars, deleted notices
+        // FIXME: does not handle modified profiles, avatars, deleted notices
 
         return strtotime($this->notices[0]->created);
     }

lib/search_engines.php

@@ -119,7 +119,7 @@ class MySQLSearch extends SearchEngine
             return true;
         } else if ('identica_notices' === $this->table) {
 
-            // Don't show imported notices
+            // Do not show imported notices
             $this->target->whereAdd('notice.is_local != ' . Notice::GATEWAY);
 
             if (strtolower($q) != $q) {

lib/util.php

@@ -62,7 +62,7 @@ function common_init_language()
     $locale_set = common_init_locale($language);
     setlocale(LC_CTYPE, 'C');
     
-    // So we don't have to make people install the gettext locales
+    // So we do not have to make people install the gettext locales
     $path = common_config('site','locale_path');
     bindtextdomain("statusnet", $path);
     bind_textdomain_codeset("statusnet", "UTF-8");
@@ -139,7 +139,7 @@ function common_check_user($nickname, $password)
                 }
             }
         }else{
-            //no handler indicated the credentials were valid, and we know their not valid because the user isn't in the database
+            //no handler indicated the credentials were valid, and we know their not valid because the user is not in the database
             return false;
         }
     } else {
@@ -396,7 +396,7 @@ function common_current_user()
 }
 
 // Logins that are 'remembered' aren't 'real' -- they're subject to
-// cookie-stealing. So, we don't let them do certain things. New reg,
+// cookie-stealing. So, we do not let them do certain things. New reg,