summaryrefslogtreecommitdiff
path: root/scripts
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 /scripts
parentc7961fe6dc033d1d40ab7d7f9bb994492ae4ea7b (diff)
parent104a47e4a2903f1c7ea73363a73cee12f0cf14ac (diff)
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/console.php2
-rw-r--r--scripts/createsim.php4
-rw-r--r--scripts/deleteuser.php4
-rwxr-xr-xscripts/fixup_utf8.php2
-rw-r--r--scripts/makegroupadmin.php4
-rw-r--r--scripts/registeruser.php4
-rw-r--r--scripts/showcache.php2
-rwxr-xr-xscripts/sitemap.php4
-rwxr-xr-xscripts/update_translations.php2
9 files changed, 14 insertions, 14 deletions
diff --git a/scripts/console.php b/scripts/console.php
index 41dd43f28..2413f5079 100755
--- a/scripts/console.php
+++ b/scripts/console.php
@@ -90,7 +90,7 @@ function readline_emulation($prompt)
if ($retval == 0) {
return $line;
} elseif ($retval == 127) {
- // Couldn't execute bash even though we thought we saw it.
+ // Could not execute bash even though we thought we saw it.
// Shell probably spit out an error message, sorry :(
// Fall through to fgets()...
} else {
diff --git a/scripts/createsim.php b/scripts/createsim.php
index 1266a9700..592853f86 100644
--- a/scripts/createsim.php
+++ b/scripts/createsim.php
@@ -85,7 +85,7 @@ function newSub($i)
$from = User::staticGet('nickname', $fromnick);
if (empty($from)) {
- throw new Exception("Can't find user '$fromnick'.");
+ throw new Exception("Cannot find user '$fromnick'.");
}
$t = rand(0, $i - 1);
@@ -102,7 +102,7 @@ function newSub($i)
$to = User::staticGet('nickname', $tunic);
if (empty($to)) {
- throw new Exception("Can't find user '$tunic'.");
+ throw new Exception("Cannot find user '$tunic'.");
}
subs_subscribe_to($from, $to);
diff --git a/scripts/deleteuser.php b/scripts/deleteuser.php
index 52389123c..39331f1a8 100644
--- a/scripts/deleteuser.php
+++ b/scripts/deleteuser.php
@@ -39,14 +39,14 @@ if (have_option('i', 'id')) {
$id = get_option_value('i', 'id');
$user = User::staticGet('id', $id);
if (empty($user)) {
- print "Can't find user with ID $id\n";
+ print "Cannot find user with ID $id\n";
exit(1);
}
} else if (have_option('n', 'nickname')) {
$nickname = get_option_value('n', 'nickname');
$user = User::staticGet('nickname', $nickname);
if (empty($user)) {
- print "Can't find user with nickname '$nickname'\n";
+ print "Cannot find user with nickname '$nickname'\n";
exit(1);
}
} else {
diff --git a/scripts/fixup_utf8.php b/scripts/fixup_utf8.php
index 5a9fba7c3..5581633ec 100755
--- a/scripts/fixup_utf8.php
+++ b/scripts/fixup_utf8.php
@@ -76,7 +76,7 @@ class UTF8FixerUpper
$succ = mysqli_set_charset($conn, $charset);
if (!$succ) {
- echo "ERROR: couldn't set charset\n";
+ echo "ERROR: Could not set charset\n";
$db->disconnect();
return NULL;
}
diff --git a/scripts/makegroupadmin.php b/scripts/makegroupadmin.php
index a68798451..07f980d58 100644
--- a/scripts/makegroupadmin.php
+++ b/scripts/makegroupadmin.php
@@ -67,7 +67,7 @@ try {
$member->created = common_sql_now();
if (!$member->insert()) {
- throw new Exception("Can't add '$nickname' to '$groupname'.");
+ throw new Exception("Cannot add '$nickname' to '$groupname'.");
}
}
@@ -80,7 +80,7 @@ try {
$member->is_admin = 1;
if (!$member->update($orig)) {
- throw new Exception("Can't make '$nickname' admin of '$groupname'.");
+ throw new Exception("Cannot make '$nickname' admin of '$groupname'.");
}
} catch (Exception $e) {
diff --git a/scripts/registeruser.php b/scripts/registeruser.php
index 5d9c8862d..8aab325b7 100644
--- a/scripts/registeruser.php
+++ b/scripts/registeruser.php
@@ -60,7 +60,7 @@ try {
'fullname' => $fullname));
if (empty($user)) {
- throw new Exception("Can't register user '$nickname' with password '$password' and fullname '$fullname'.");
+ throw new Exception("Cannot register user '$nickname' with password '$password' and fullname '$fullname'.");
}
if (!empty($email)) {
@@ -71,7 +71,7 @@ try {
if (!$user->updateKeys($orig)) {
print "Failed!\n";
- throw new Exception("Can't update email address.");
+ throw new Exception("Cannot update email address.");
}
}
diff --git a/scripts/showcache.php b/scripts/showcache.php
index f17979572..6b00a8f7b 100644
--- a/scripts/showcache.php
+++ b/scripts/showcache.php
@@ -58,7 +58,7 @@ print "Checking key '$k'...\n";
$c = common_memcache();
if (empty($c)) {
- die("Can't initialize cache object!\n");
+ die("Cannot initialize cache object!\n");
}
$obj = $c->get($k);
diff --git a/scripts/sitemap.php b/scripts/sitemap.php
index f8c392146..ee5d33e1e 100755
--- a/scripts/sitemap.php
+++ b/scripts/sitemap.php
@@ -377,11 +377,11 @@ function write_file($path, $data)
}
if (($fh_out = fopen($path,'w')) === false) {
- error("couldn't open $path for writing.");
+ error("Could not open $path for writing.");
}
if (fwrite($fh_out, $data) === false) {
- error("couldn't write to $path.");
+ error("Could not write to $path.");
}
}
diff --git a/scripts/update_translations.php b/scripts/update_translations.php
index 580c472ee..8d4c9d3d2 100755
--- a/scripts/update_translations.php
+++ b/scripts/update_translations.php
@@ -98,7 +98,7 @@ foreach ($languages as $language) {
$new_file = curl_get_file($file_url);
if ($new_file === FALSE) {
- echo "Couldn't retrieve .po file for $code: $file_url\n";
+ echo "Could not retrieve .po file for $code: $file_url\n";
continue;
}