From 04ae500749ea2e5937ac1f28ef8c7edf4f99f0a1 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Thu, 28 Oct 2010 01:19:04 +0200 Subject: * i18n/L10n fixes. * translator documentation updated. * superfluous whitespace removed. --- actions/apitimelinegroup.php | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'actions/apitimelinegroup.php') diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php index 5138a4b5e..a85da4b0f 100644 --- a/actions/apitimelinegroup.php +++ b/actions/apitimelinegroup.php @@ -49,10 +49,8 @@ require_once INSTALLDIR . '/lib/apiprivateauth.php'; * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class ApiTimelineGroupAction extends ApiPrivateAuthAction { - var $group = null; var $notices = null; @@ -64,7 +62,6 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction * @return boolean success flag * */ - function prepare($args) { parent::prepare($args); @@ -83,12 +80,12 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction * * @return void */ - function handle($args) { parent::handle($args); if (empty($this->group)) { + // TRANS: Client error displayed requesting most recent notices to a group for a non-existing group. $this->clientError(_('Group not found.'), 404, $this->format); return false; } @@ -102,7 +99,6 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction * * @return void */ - function showTimeline() { // We'll pull common formatting out of this for other formats @@ -126,7 +122,6 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction ); break; case 'atom': - header('Content-Type: application/atom+xml; charset=utf-8'); try { @@ -138,19 +133,21 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction $this->raw($atom->getString()); } catch (Atom10FeedException $e) { $this->serverError( - 'Could not generate feed for group - ' . $e->getMessage(), + // TRANS: Server error displayed when generating an Atom feed fails. + // TRANS: %s is the error. + sprintf(_('Could not generate feed for group - %s'),$e->getMessage()), 400, $this->format ); return; } - break; case 'json': $this->showJsonTimeline($this->notices); break; default: $this->clientError( + // TRANS: Client error displayed when trying to handle an unknown API method. _('API method not found.'), 404, $this->format @@ -164,7 +161,6 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction * * @return array notices */ - function getNotices() { $notices = array(); @@ -190,7 +186,6 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction * * @return boolean true */ - function isReadOnly($args) { return true; @@ -201,7 +196,6 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction * * @return string datestamp of the latest notice in the stream */ - function lastModified() { if (!empty($this->notices) && (count($this->notices) > 0)) { @@ -219,7 +213,6 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction * * @return string etag */ - function etag() { if (!empty($this->notices) && (count($this->notices) > 0)) { @@ -240,5 +233,4 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction return null; } - } -- cgit v1.2.3-54-g00ecf