Update translator documentation
Update L10n Remove superfluous whitespace
This commit is contained in:
parent
882b6862a3
commit
26652d9be6
@ -39,7 +39,6 @@ require_once INSTALLDIR.'/lib/apibareauth.php';
|
|||||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
|
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
|
||||||
* @link http://status.net/
|
* @link http://status.net/
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class ApiAtomServiceAction extends ApiBareAuthAction
|
class ApiAtomServiceAction extends ApiBareAuthAction
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
@ -50,13 +49,13 @@ class ApiAtomServiceAction extends ApiBareAuthAction
|
|||||||
* @return boolean success flag
|
* @return boolean success flag
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function prepare($args)
|
function prepare($args)
|
||||||
{
|
{
|
||||||
parent::prepare($args);
|
parent::prepare($args);
|
||||||
$this->user = $this->getTargetUser($this->arg('id'));
|
$this->user = $this->getTargetUser($this->arg('id'));
|
||||||
|
|
||||||
if (empty($this->user)) {
|
if (empty($this->user)) {
|
||||||
|
// TRANS: Client error displayed when making an Atom API request for an unknown user.
|
||||||
$this->clientError(_('No such user.'), 404, $this->format);
|
$this->clientError(_('No such user.'), 404, $this->format);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -71,7 +70,6 @@ class ApiAtomServiceAction extends ApiBareAuthAction
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function handle($args)
|
function handle($args)
|
||||||
{
|
{
|
||||||
parent::handle($args);
|
parent::handle($args);
|
||||||
@ -83,13 +81,15 @@ class ApiAtomServiceAction extends ApiBareAuthAction
|
|||||||
'xmlns:atom' => 'http://www.w3.org/2005/Atom',
|
'xmlns:atom' => 'http://www.w3.org/2005/Atom',
|
||||||
'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/'));
|
'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/'));
|
||||||
$this->elementStart('workspace');
|
$this->elementStart('workspace');
|
||||||
$this->element('atom:title', null, _('Main'));
|
// TRANS: Title for Atom feed.
|
||||||
|
$this->element('atom:title', null, _m('ATOM','Main'));
|
||||||
$this->elementStart('collection',
|
$this->elementStart('collection',
|
||||||
array('href' => common_local_url('ApiTimelineUser',
|
array('href' => common_local_url('ApiTimelineUser',
|
||||||
array('id' => $this->user->id,
|
array('id' => $this->user->id,
|
||||||
'format' => 'atom'))));
|
'format' => 'atom'))));
|
||||||
$this->element('atom:title',
|
$this->element('atom:title',
|
||||||
null,
|
null,
|
||||||
|
// TRANS: Title for Atom feed. %s is a user nickname.
|
||||||
sprintf(_("%s timeline"),
|
sprintf(_("%s timeline"),
|
||||||
$this->user->nickname));
|
$this->user->nickname));
|
||||||
$this->element('accept', null, 'application/atom+xml;type=entry');
|
$this->element('accept', null, 'application/atom+xml;type=entry');
|
||||||
@ -100,6 +100,7 @@ class ApiAtomServiceAction extends ApiBareAuthAction
|
|||||||
array('subscriber' => $this->user->id))));
|
array('subscriber' => $this->user->id))));
|
||||||
$this->element('atom:title',
|
$this->element('atom:title',
|
||||||
null,
|
null,
|
||||||
|
// TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
|
||||||
sprintf(_("%s subscriptions"),
|
sprintf(_("%s subscriptions"),
|
||||||
$this->user->nickname));
|
$this->user->nickname));
|
||||||
$this->element('accept', null, 'application/atom+xml;type=entry');
|
$this->element('accept', null, 'application/atom+xml;type=entry');
|
||||||
@ -110,6 +111,7 @@ class ApiAtomServiceAction extends ApiBareAuthAction
|
|||||||
array('profile' => $this->user->id))));
|
array('profile' => $this->user->id))));
|
||||||
$this->element('atom:title',
|
$this->element('atom:title',
|
||||||
null,
|
null,
|
||||||
|
// TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
|
||||||
sprintf(_("%s favorites"),
|
sprintf(_("%s favorites"),
|
||||||
$this->user->nickname));
|
$this->user->nickname));
|
||||||
$this->element('accept', null, 'application/atom+xml;type=entry');
|
$this->element('accept', null, 'application/atom+xml;type=entry');
|
||||||
@ -120,6 +122,7 @@ class ApiAtomServiceAction extends ApiBareAuthAction
|
|||||||
array('profile' => $this->user->id))));
|
array('profile' => $this->user->id))));
|
||||||
$this->element('atom:title',
|
$this->element('atom:title',
|
||||||
null,
|
null,
|
||||||
|
// TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
|
||||||
sprintf(_("%s memberships"),
|
sprintf(_("%s memberships"),
|
||||||
$this->user->nickname));
|
$this->user->nickname));
|
||||||
$this->element('accept', null, 'application/atom+xml;type=entry');
|
$this->element('accept', null, 'application/atom+xml;type=entry');
|
||||||
|
@ -92,6 +92,7 @@ class ApiBlockCreateAction extends ApiAuthAction
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (empty($this->user) || empty($this->other)) {
|
if (empty($this->user) || empty($this->other)) {
|
||||||
|
// TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
|
||||||
$this->clientError(_('No such user.'), 404, $this->format);
|
$this->clientError(_('No such user.'), 404, $this->format);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -114,6 +114,7 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
|
|||||||
$this->deleteNotice();
|
$this->deleteNotice();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
// TRANS: Client error displayed calling an unsupported HTTP error in API status show.
|
||||||
$this->clientError(_('HTTP method not supported.'), 405);
|
$this->clientError(_('HTTP method not supported.'), 405);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -138,6 +139,8 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
|
|||||||
$this->showSingleAtomStatus($this->notice);
|
$this->showSingleAtomStatus($this->notice);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
// TRANS: Exception thrown requesting an unsupported notice output format.
|
||||||
|
// TRANS: %s is the requested output format.
|
||||||
throw new Exception(sprintf(_("Unsupported format: %s"), $this->format));
|
throw new Exception(sprintf(_("Unsupported format: %s"), $this->format));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -171,7 +174,7 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
|
|||||||
*
|
*
|
||||||
* @return boolean true
|
* @return boolean true
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function isReadOnly($args)
|
function isReadOnly($args)
|
||||||
{
|
{
|
||||||
return ($_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'HEAD');
|
return ($_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'HEAD');
|
||||||
@ -220,6 +223,7 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
|
|||||||
function deleteNotice()
|
function deleteNotice()
|
||||||
{
|
{
|
||||||
if ($this->format != 'atom') {
|
if ($this->format != 'atom') {
|
||||||
|
// TRANS: Client error displayed when trying to delete a notice not using the Atom format.
|
||||||
$this->clientError(_("Can only delete using the Atom format."));
|
$this->clientError(_("Can only delete using the Atom format."));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -227,7 +231,8 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
|
|||||||
if (empty($this->auth_user) ||
|
if (empty($this->auth_user) ||
|
||||||
($this->notice->profile_id != $this->auth_user->id &&
|
($this->notice->profile_id != $this->auth_user->id &&
|
||||||
!$this->auth_user->hasRight(Right::DELETEOTHERSNOTICE))) {
|
!$this->auth_user->hasRight(Right::DELETEOTHERSNOTICE))) {
|
||||||
$this->clientError(_('Can\'t delete this notice.'), 403);
|
// TRANS: Client error displayed when a user has no rights to delete notices of other users.
|
||||||
|
$this->clientError(_('Cannot delete this notice.'), 403);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -240,6 +245,7 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
|
|||||||
|
|
||||||
header('HTTP/1.1 200 OK');
|
header('HTTP/1.1 200 OK');
|
||||||
header('Content-Type: text/plain');
|
header('Content-Type: text/plain');
|
||||||
|
// TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
|
||||||
print(sprintf(_('Deleted notice %d'), $this->notice->id));
|
print(sprintf(_('Deleted notice %d'), $this->notice->id));
|
||||||
print("\n");
|
print("\n");
|
||||||
}
|
}
|
||||||
|
@ -75,7 +75,7 @@ class DeletenoticeAction extends Action
|
|||||||
if ($this->notice->profile_id != $this->user_profile->id &&
|
if ($this->notice->profile_id != $this->user_profile->id &&
|
||||||
!$this->user->hasRight(Right::DELETEOTHERSNOTICE)) {
|
!$this->user->hasRight(Right::DELETEOTHERSNOTICE)) {
|
||||||
// TRANS: Error message displayed trying to delete a notice that was not made by the current user.
|
// TRANS: Error message displayed trying to delete a notice that was not made by the current user.
|
||||||
common_user_error(_('Can\'t delete this notice.'));
|
common_user_error(_('Cannot delete this notice.'));
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
// XXX: Ajax!
|
// XXX: Ajax!
|
||||||
|
Loading…
Reference in New Issue
Block a user