summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiebrand Mazeland <s.mazeland@xs4all.nl>2010-04-10 00:07:20 +0200
committerBrion Vibber <brion@pobox.com>2010-04-09 15:29:41 -0700
commit5c6c9b6f5f40b50570505a366a858e83db9bb2ec (patch)
tree7b247813faa54fd3dd4e6f318c65831e28409ad4
parent58d5d7baeec6fae77ac5d3e82e6072725fe9bf1b (diff)
Update message formatting for serverError to use a starting capital and a leading period.
-rw-r--r--actions/all.php2
-rw-r--r--actions/apitimelineretweetedbyme.php2
-rw-r--r--actions/avatarsettings.php4
-rw-r--r--actions/confirmaddress.php2
-rw-r--r--actions/finishremotesubscribe.php2
-rw-r--r--actions/oembed.php14
-rw-r--r--actions/public.php2
-rw-r--r--actions/remotesubscribe.php2
-rw-r--r--actions/replies.php2
-rw-r--r--actions/showfavorites.php2
-rw-r--r--actions/tag.php2
11 files changed, 18 insertions, 18 deletions
diff --git a/actions/all.php b/actions/all.php
index 8c22e6f5f..a977fce95 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -61,7 +61,7 @@ class AllAction extends ProfileAction
if ($this->page > 1 && $this->notice->N == 0) {
// TRANS: Server error when page not found (404)
- $this->serverError(_('No such page'), $code = 404);
+ $this->serverError(_('No such page.'), $code = 404);
}
return true;
diff --git a/actions/apitimelineretweetedbyme.php b/actions/apitimelineretweetedbyme.php
index 564e98619..af05623cd 100644
--- a/actions/apitimelineretweetedbyme.php
+++ b/actions/apitimelineretweetedbyme.php
@@ -69,7 +69,7 @@ class ApiTimelineRetweetedByMeAction extends ApiAuthAction
{
parent::prepare($args);
- $this->serverError('Unimplemented', 503);
+ $this->serverError('Unimplemented.', 503);
return false;
}
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index d4ea11cb7..52dc2e424 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -103,7 +103,7 @@ class AvatarsettingsAction extends AccountSettingsAction
if (!$profile) {
common_log_db_error($user, 'SELECT', __FILE__);
- $this->serverError(_('User without matching profile'));
+ $this->serverError(_('User without matching profile.'));
return;
}
@@ -182,7 +182,7 @@ class AvatarsettingsAction extends AccountSettingsAction
if (!$profile) {
common_log_db_error($user, 'SELECT', __FILE__);
- $this->serverError(_('User without matching profile'));
+ $this->serverError(_('User without matching profile.'));
return;
}
diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index cc8351d8d..dc17499f5 100644
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -87,7 +87,7 @@ class ConfirmaddressAction extends Action
}
$type = $confirm->address_type;
if (!in_array($type, array('email', 'jabber', 'sms'))) {
- $this->serverError(sprintf(_('Unrecognized address type %s'), $type));
+ $this->serverError(sprintf(_('Unrecognized address type %s.'), $type));
return;
}
if ($cur->$type == $confirm->address) {
diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php
index deee70f36..ac51ddec3 100644
--- a/actions/finishremotesubscribe.php
+++ b/actions/finishremotesubscribe.php
@@ -135,7 +135,7 @@ class FinishremotesubscribeAction extends Action
$service->getServiceURI(OMB_ENDPOINT_UPDATEPROFILE);
if (!$remote->update($orig_remote)) {
- $this->serverError(_('Error updating remote profile'));
+ $this->serverError(_('Error updating remote profile.'));
return;
}
diff --git a/actions/oembed.php b/actions/oembed.php
index 4a11a85e0..1503aa9c2 100644
--- a/actions/oembed.php
+++ b/actions/oembed.php
@@ -60,7 +60,7 @@ class OembedAction extends Action
$proxy_args = $r->map($path);
if (!$proxy_args) {
- $this->serverError(_("$path not found"), 404);
+ $this->serverError(_("$path not found."), 404);
}
$oembed=array();
$oembed['version']='1.0';
@@ -72,11 +72,11 @@ class OembedAction extends Action
$id = $proxy_args['notice'];
$notice = Notice::staticGet($id);
if(empty($notice)){
- $this->serverError(_("notice $id not found"), 404);
+ $this->serverError(_("Notice $id not found."), 404);
}
$profile = $notice->getProfile();
if (empty($profile)) {
- $this->serverError(_('Notice has no profile'), 500);
+ $this->serverError(_('Notice has no profile.'), 500);
}
if (!empty($profile->fullname)) {
$authorname = $profile->fullname . ' (' . $profile->nickname . ')';
@@ -95,7 +95,7 @@ class OembedAction extends Action
$id = $proxy_args['attachment'];
$attachment = File::staticGet($id);
if(empty($attachment)){
- $this->serverError(_("attachment $id not found"), 404);
+ $this->serverError(_("Attachment $id not found."), 404);
}
if(empty($attachment->filename) && $file_oembed = File_oembed::staticGet('file_id', $attachment->id)){
// Proxy the existing oembed information
@@ -123,7 +123,7 @@ class OembedAction extends Action
if($attachment->title) $oembed['title']=$attachment->title;
break;
default:
- $this->serverError(_("$path not supported for oembed requests"), 501);
+ $this->serverError(_("$path not supported for oembed requests."), 501);
}
switch($args['format']){
case 'xml':
@@ -155,11 +155,11 @@ class OembedAction extends Action
break;
default:
// TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
- $this->serverError(sprintf(_('content type %s not supported'), $apidata['content-type']), 501);
+ $this->serverError(sprintf(_('Content type %s not supported.'), $apidata['content-type']), 501);
}
}else{
// TRANS: Error message displaying attachments. %s is the site's base URL.
- $this->serverError(sprintf(_('Only %s urls over plain http please'), common_root_url()), 404);
+ $this->serverError(sprintf(_('Only %s URLs over plain HTTP please.'), common_root_url()), 404);
}
}
diff --git a/actions/public.php b/actions/public.php
index 0b3b5fde8..8e9db10ca 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -95,7 +95,7 @@ class PublicAction extends Action
if($this->page > 1 && $this->notice->N == 0){
// TRANS: Server error when page not found (404)
- $this->serverError(_('No such page'),$code=404);
+ $this->serverError(_('No such page.'),$code=404);
}
return true;
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index c723d53a1..9fc235e74 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -188,7 +188,7 @@ class RemotesubscribeAction extends Action
$profile = $user->getProfile();
if (!$profile) {
common_log_db_error($user, 'SELECT', __FILE__);
- $this->serverError(_('User without matching profile'));
+ $this->serverError(_('User without matching profile.'));
return;
}
diff --git a/actions/replies.php b/actions/replies.php
index 4ff1b7a8d..608f71d6e 100644
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -90,7 +90,7 @@ class RepliesAction extends OwnerDesignAction
if($this->page > 1 && $this->notice->N == 0){
// TRANS: Server error when page not found (404)
- $this->serverError(_('No such page'),$code=404);
+ $this->serverError(_('No such page.'),$code=404);
}
return true;
diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index 5b85de683..4d776ef04 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -135,7 +135,7 @@ class ShowfavoritesAction extends OwnerDesignAction
if($this->page > 1 && $this->notice->N == 0){
// TRANS: Server error when page not found (404)
- $this->serverError(_('No such page'),$code=404);
+ $this->serverError(_('No such page.'),$code=404);
}
return true;
diff --git a/actions/tag.php b/actions/tag.php
index ee9617b66..953240404 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -49,7 +49,7 @@ class TagAction extends Action
if($this->page > 1 && $this->notice->N == 0){
// TRANS: Server error when page not found (404)
- $this->serverError(_('No such page'),$code=404);
+ $this->serverError(_('No such page.'),$code=404);
}
return true;