diff options
| author | Brion Vibber <brion@pobox.com> | 2010-04-09 15:20:14 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-04-09 15:20:14 -0700 |
| commit | 7303acf7adbfd57aabcad095154ee48968e75e3b (patch) | |
| tree | 038dca53ca8c192c8c66c52e6b9332f47f55cf1e /actions/oembed.php | |
| parent | ae4ade53a801309105ab3e0ae680dc9e186033c1 (diff) | |
| parent | 47eed2c99906fefb1f43ad186da91e526d2741cf (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/oembed.php')
| -rw-r--r-- | actions/oembed.php | 14 |
1 files changed, 7 insertions, 7 deletions
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); } } |