GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Update message formatting for serverError to use a starting capital and a leading period.

Browse Source
This commit is contained in:
Siebrand Mazeland 2010-04-10 00:07:20 +02:00
parent 9bc1a22fa9
commit 47eed2c999
11 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/all.php
View File

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

2
actions/apitimelineretweetedbyme.php
View File

@ -69,7 +69,7 @@ class ApiTimelineRetweetedByMeAction extends ApiAuthAction
{
parent::prepare($args);
$this->serverError('Unimplemented', 503);
$this->serverError('Unimplemented.', 503);
return false;
}

4
actions/avatarsettings.php
View File

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

2
actions/confirmaddress.php
View File

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

2
actions/finishremotesubscribe.php
View File

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

14
actions/oembed.php
View File

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

2
actions/public.php
View File

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

2
actions/remotesubscribe.php
View File

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

2
actions/replies.php
View File

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

2
actions/showfavorites.php
View File

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

2
actions/tag.php
View File

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