summaryrefslogtreecommitdiff
path: root/plugins/Facebook
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2009-11-08 23:27:24 +0100
committerBrion Vibber <brion@pobox.com>2009-11-08 23:27:24 +0100
commitec6a38a62786c85e8ee30c5726ea81f82465b39d (patch)
tree31bb66f24f8fb4de55d9f6a21728278fcac804a1 /plugins/Facebook
parentc7961fe6dc033d1d40ab7d7f9bb994492ae4ea7b (diff)
parent104a47e4a2903f1c7ea73363a73cee12f0cf14ac (diff)
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'plugins/Facebook')
-rwxr-xr-xplugins/Facebook/facebook/facebookapi_php5_restlib.php2
-rw-r--r--plugins/Facebook/facebook/jsonwrapper/JSON/JSON.php2
-rw-r--r--plugins/Facebook/facebookaction.php2
-rw-r--r--plugins/Facebook/facebookhome.php2
4 files changed, 4 insertions, 4 deletions
diff --git a/plugins/Facebook/facebook/facebookapi_php5_restlib.php b/plugins/Facebook/facebook/facebookapi_php5_restlib.php
index 55cb7fb86..e2a6fe88b 100755
--- a/plugins/Facebook/facebook/facebookapi_php5_restlib.php
+++ b/plugins/Facebook/facebook/facebookapi_php5_restlib.php
@@ -2951,7 +2951,7 @@ function toggleDisplay(id, type) {
/**
- * Bans a list of users from the app. Banned users can't
+ * Bans a list of users from the app. Banned users cannot
* access the app's canvas page and forums.
*
* @param array $uids an array of user ids
diff --git a/plugins/Facebook/facebook/jsonwrapper/JSON/JSON.php b/plugins/Facebook/facebook/jsonwrapper/JSON/JSON.php
index 0cddbddb4..92542b47d 100644
--- a/plugins/Facebook/facebook/jsonwrapper/JSON/JSON.php
+++ b/plugins/Facebook/facebook/jsonwrapper/JSON/JSON.php
@@ -124,7 +124,7 @@ class Services_JSON
* "{...}" syntax creates associative arrays
* instead of objects in decode().
* - SERVICES_JSON_SUPPRESS_ERRORS: error suppression.
- * Values which can't be encoded (e.g. resources)
+ * Values which cannot be encoded (e.g. resources)
* appear as NULL instead of throwing errors.
* By default, a deeply-nested resource will
* bubble up with an error, so all return values
diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php
index a10fdf90d..1d8b5217b 100644
--- a/plugins/Facebook/facebookaction.php
+++ b/plugins/Facebook/facebookaction.php
@@ -513,7 +513,7 @@ class FacebookNoticeList extends NoticeList
/**
* 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/plugins/Facebook/facebookhome.php b/plugins/Facebook/facebookhome.php
index 91c0cc6b8..ee6e6620b 100644
--- a/plugins/Facebook/facebookhome.php
+++ b/plugins/Facebook/facebookhome.php
@@ -108,7 +108,7 @@ class FacebookhomeAction extends FacebookAction
$user = User::staticGet('nickname', $nickname);
if (!$user) {
- $this->showLoginForm(_("Server error - couldn't get user!"));
+ $this->showLoginForm(_("Server error. Could not get user."));
}
$flink = DB_DataObject::factory('foreign_link');