summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/attachmentlist.php2
-rw-r--r--lib/noticelist.php2
-rw-r--r--lib/oauthstore.php4
-rw-r--r--lib/profilelist.php2
-rw-r--r--lib/serverexception.php2
-rw-r--r--lib/settingsaction.php2
-rw-r--r--lib/util.php2
-rw-r--r--lib/xmppqueuehandler.php2
8 files changed, 9 insertions, 9 deletions
diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index 51ceca857..60095dace 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -71,7 +71,7 @@ class AttachmentList extends Widget
/**
* show the list of notices
*
- * "Uses up" the stream by looping through it. So, probably can't
+ * "Uses up" the stream by looping through it. So, probably cannot
* be called twice on the same list.
*
* @return int count of notices listed.
diff --git a/lib/noticelist.php b/lib/noticelist.php
index bf12bb73c..027db2b3e 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -75,7 +75,7 @@ class NoticeList extends Widget
/**
* show the list of notices
*
- * "Uses up" the stream by looping through it. So, probably can't
+ * "Uses up" the stream by looping through it. So, probably cannot
* be called twice on the same list.
*
* @return int count of notices listed.
diff --git a/lib/oauthstore.php b/lib/oauthstore.php
index d617a7df7..a4ea5ad4d 100644
--- a/lib/oauthstore.php
+++ b/lib/oauthstore.php
@@ -351,7 +351,7 @@ class StatusNetOAuthDataStore extends OAuthDataStore
$author = User::staticGet('uri', $author_uri);
}
if (!$author) {
- throw new Exception('No such user');
+ throw new Exception('No such user.');
}
common_log(LOG_DEBUG, print_r($author, true), __FILE__);
@@ -407,7 +407,7 @@ class StatusNetOAuthDataStore extends OAuthDataStore
$user = User::staticGet('uri', $uri);
}
if (!$user) {
- throw new Exception('No such user');
+ throw new Exception('No such user.');
}
return $user;
}
diff --git a/lib/profilelist.php b/lib/profilelist.php
index bbb722701..f3eb66658 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -269,7 +269,7 @@ class ProfileListItem extends Widget
$usf = new UnsubscribeForm($this->out, $this->profile);
$usf->show();
} else {
- // Is it a local user? can't remote sub from a list
+ // Is it a local user? cannot remote sub from a list
// XXX: make that possible!
$other = User::staticGet('id', $this->profile->id);
if (!empty($other)) {
diff --git a/lib/serverexception.php b/lib/serverexception.php
index 7dc9765ad..6b2d55a0b 100644
--- a/lib/serverexception.php
+++ b/lib/serverexception.php
@@ -34,7 +34,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
/**
* Class for server exceptions
*
- * Subclass of PHP Exception for server errors. The user typically can't fix these.
+ * Subclass of PHP Exception for server errors. The user typically cannot fix these.
*
* @category Exception
* @package StatusNet
diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index c3669868d..4193ea521 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -72,7 +72,7 @@ class SettingsAction extends CurrentUserDesignAction
$this->clientError(_('Not logged in.'));
return;
} else if (!common_is_real_login()) {
- // Cookie theft means that automatic logins can't
+ // Cookie theft means that automatic logins cannot
// change important settings or see private info, and
// _all_ our settings are important
common_set_returnto($this->selfUrl());
diff --git a/lib/util.php b/lib/util.php
index a4865c46c..dde3fb48f 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -576,7 +576,7 @@ function common_linkify($url) {
} elseif (is_string($longurl_data)) {
$longurl = $longurl_data;
} else {
- throw new ServerException("Can't linkify url '$url'");
+ throw new ServerException("Cannot linkify url '$url'");
}
}
$attrs = array('href' => $canon, 'title' => $longurl, 'rel' => 'external');
diff --git a/lib/xmppqueuehandler.php b/lib/xmppqueuehandler.php
index f28fc9088..8acdcafe7 100644
--- a/lib/xmppqueuehandler.php
+++ b/lib/xmppqueuehandler.php
@@ -43,7 +43,7 @@ class XmppQueueHandler extends QueueHandler
$this->conn = jabber_connect($this->_id.$this->transport());
if (empty($this->conn)) {
- $this->log(LOG_ERR, "Couldn't connect to server.");
+ $this->log(LOG_ERR, "Could not connect to server.");
return false;
}