git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

Commit 7db24c32 authored by Siebrand Mazeland's avatar Siebrand Mazeland

* fix some i18n and L10n issues

* update/add translator documentation
* remove superfluous whitespace
parent c0bb1a57
...@@ -331,8 +331,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction ...@@ -331,8 +331,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
if (Event::handle('StartAtomPubNewActivity', array(&$activity, $this->user, &$saved))) { if (Event::handle('StartAtomPubNewActivity', array(&$activity, $this->user, &$saved))) {
if ($activity->verb != ActivityVerb::POST) { if ($activity->verb != ActivityVerb::POST) {
// TRANS: Client error displayed when not using the POST verb. // TRANS: Client error displayed when not using the POST verb. Do not translate POST.
// TRANS: Do not translate POST.
$this->clientError(_('Can only handle POST activities.')); $this->clientError(_('Can only handle POST activities.'));
return; return;
} }
......
...@@ -244,8 +244,7 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction ...@@ -244,8 +244,7 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction
if (Event::handle('StartAtomPubNewActivity', array(&$activity))) { if (Event::handle('StartAtomPubNewActivity', array(&$activity))) {
if ($activity->verb != ActivityVerb::FOLLOW) { if ($activity->verb != ActivityVerb::FOLLOW) {
// TRANS: Client error displayed when not using the POST verb. // TRANS: Client error displayed when not using the follow verb.
// TRANS: Do not translate POST.
$this->clientError(_('Can only handle Follow activities.')); $this->clientError(_('Can only handle Follow activities.'));
return; return;
} }
...@@ -264,14 +263,17 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction ...@@ -264,14 +263,17 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction
if (empty($profile)) { if (empty($profile)) {
// TRANS: Client exception thrown when subscribing to a non-existing profile. // TRANS: Client exception thrown when subscribing to a non-existing profile.
// TRANS: %s is the unknown profile ID.
$this->clientError(sprintf(_('Unknown profile %s.'), $person->id)); $this->clientError(sprintf(_('Unknown profile %s.'), $person->id));
return; return;
} }
if (Subscription::exists($this->_profile, $profile)) { if (Subscription::exists($this->_profile, $profile)) {
// 409 Conflict // 409 Conflict
$this->clientError(sprintf(_('Already subscribed to %s'), // TRANS: Client error displayed trying to subscribe to an already subscribed profile.
$person->id), // TRANS: %s is the profile the user already has a subscription on.
$this->clientError(sprintf(_('Already subscribed to %s.'),
$person->id),
409); 409);
return; return;
} }
......
...@@ -183,11 +183,12 @@ class NewgroupAction extends Action ...@@ -183,11 +183,12 @@ class NewgroupAction extends Action
foreach ($aliases as $alias) { foreach ($aliases as $alias) {
if (!Nickname::isValid($alias)) { if (!Nickname::isValid($alias)) {
// TRANS: Group create form validation error. // TRANS: Group create form validation error.
// TRANS: %s is the invalid alias.
$this->showForm(sprintf(_('Invalid alias: "%s"'), $alias)); $this->showForm(sprintf(_('Invalid alias: "%s"'), $alias));
return; return;
} }
if ($this->nicknameExists($alias)) { if ($this->nicknameExists($alias)) {
// TRANS: Group create form validation error. // TRANS: Group create form validation error. %s is the already used alias.
$this->showForm(sprintf(_('Alias "%s" already in use. Try another one.'), $this->showForm(sprintf(_('Alias "%s" already in use. Try another one.'),
$alias)); $alias));
return; return;
...@@ -195,7 +196,7 @@ class NewgroupAction extends Action ...@@ -195,7 +196,7 @@ class NewgroupAction extends Action
// XXX assumes alphanum nicknames // XXX assumes alphanum nicknames
if (strcmp($alias, $nickname) == 0) { if (strcmp($alias, $nickname) == 0) {
// TRANS: Group create form validation error. // TRANS: Group create form validation error.
$this->showForm(_('Alias can\'t be the same as nickname.')); $this->showForm(_('Alias cannot be the same as nickname.'));
return; return;
} }
} }
......
...@@ -167,15 +167,14 @@ class SubscriptionsAction extends GalleryAction ...@@ -167,15 +167,14 @@ class SubscriptionsAction extends GalleryAction
* *
* @return array of Feed objects * @return array of Feed objects
*/ */
function getFeeds() function getFeeds()
{ {
return array(new Feed(Feed::ATOM, return array(new Feed(Feed::ATOM,
common_local_url('AtomPubSubscriptionFeed', common_local_url('AtomPubSubscriptionFeed',
array('subscriber' => $this->profile->id)), array('subscriber' => $this->profile->id)),
// TRANS: Atom feed title. %s is a profile nickname.
sprintf(_('Subscription feed for %s (Atom)'), sprintf(_('Subscription feed for %s (Atom)'),
$this->profile->nickname))); $this->profile->nickname)));
} }
} }
...@@ -261,5 +260,4 @@ class SubscriptionsListItem extends SubscriptionListItem ...@@ -261,5 +260,4 @@ class SubscriptionsListItem extends SubscriptionListItem
$this->out->elementEnd('form'); $this->out->elementEnd('form');
return; return;
} }
} }
...@@ -241,7 +241,7 @@ class Notice extends Memcached_DataObject ...@@ -241,7 +241,7 @@ class Notice extends Memcached_DataObject
* array 'urls' list of attached/referred URLs to save with the * array 'urls' list of attached/referred URLs to save with the
* notice in place of extracting links from content * notice in place of extracting links from content
* boolean 'distribute' whether to distribute the notice, default true * boolean 'distribute' whether to distribute the notice, default true
* *
* @fixme tag override * @fixme tag override
* *
* @return Notice * @return Notice
...@@ -1240,7 +1240,7 @@ class Notice extends Memcached_DataObject ...@@ -1240,7 +1240,7 @@ class Notice extends Memcached_DataObject
* Convert a notice into an activity for export. * Convert a notice into an activity for export.
* *
* @param User $cur Current user * @param User $cur Current user
* *
* @return Activity activity object representing this Notice. * @return Activity activity object representing this Notice.
*/ */
...@@ -1253,11 +1253,11 @@ class Notice extends Memcached_DataObject ...@@ -1253,11 +1253,11 @@ class Notice extends Memcached_DataObject
} }
$act = new Activity(); $act = new Activity();
if (Event::handle('StartNoticeAsActivity', array($this, &$act))) { if (Event::handle('StartNoticeAsActivity', array($this, &$act))) {
$profile = $this->getProfile(); $profile = $this->getProfile();
$act->actor = ActivityObject::fromProfile($profile); $act->actor = ActivityObject::fromProfile($profile);
$act->verb = ActivityVerb::POST; $act->verb = ActivityVerb::POST;
$act->objects[] = ActivityObject::fromNotice($this); $act->objects[] = ActivityObject::fromNotice($this);
...@@ -1266,7 +1266,7 @@ class Notice extends Memcached_DataObject ...@@ -1266,7 +1266,7 @@ class Notice extends Memcached_DataObject
$act->time = strtotime($this->created); $act->time = strtotime($this->created);
$act->link = $this->bestUrl(); $act->link = $this->bestUrl();
$act->content = common_xml_safe_str($this->rendered); $act->content = common_xml_safe_str($this->rendered);
$act->id = $this->uri; $act->id = $this->uri;
$act->title = common_xml_safe_str($this->content); $act->title = common_xml_safe_str($this->content);
...@@ -1293,9 +1293,9 @@ class Notice extends Memcached_DataObject ...@@ -1293,9 +1293,9 @@ class Notice extends Memcached_DataObject
$act->enclosures[] = $enclosure; $act->enclosures[] = $enclosure;
} }
} }
$ctx = new ActivityContext(); $ctx = new ActivityContext();
if (!empty($this->reply_to)) { if (!empty($this->reply_to)) {
$reply = Notice::staticGet('id', $this->reply_to); $reply = Notice::staticGet('id', $this->reply_to);
if (!empty($reply)) { if (!empty($reply)) {
...@@ -1303,29 +1303,29 @@ class Notice extends Memcached_DataObject ...@@ -1303,29 +1303,29 @@ class Notice extends Memcached_DataObject
$ctx->replyToUrl = $reply->bestUrl(); $ctx->replyToUrl = $reply->bestUrl();
} }
} }
$ctx->location = $this->getLocation(); $ctx->location = $this->getLocation();
$conv = null; $conv = null;
if (!empty($this->conversation)) { if (!empty($this->conversation)) {
$conv = Conversation::staticGet('id', $this->conversation); $conv = Conversation::staticGet('id', $this->conversation);
if (!empty($conv)) { if (!empty($conv)) {
$ctx->conversation = $conv->uri; $ctx->conversation = $conv->uri;
} }
} }
$reply_ids = $this->getReplies(); $reply_ids = $this->getReplies();
foreach ($reply_ids as $id) { foreach ($reply_ids as $id) {
$profile = Profile::staticGet('id', $id); $profile = Profile::staticGet('id', $id);
if (!empty($profile)) { if (!empty($profile)) {
$ctx->attention[] = $profile->getUri(); $ctx->attention[] = $profile->getUri();
} }
} }
$groups = $this->getGroups(); $groups = $this->getGroups();
foreach ($groups as $group) { foreach ($groups as $group) {
$ctx->attention[] = $group->uri; $ctx->attention[] = $group->uri;
} }
...@@ -1339,7 +1339,7 @@ class Notice extends Memcached_DataObject ...@@ -1339,7 +1339,7 @@ class Notice extends Memcached_DataObject
$ctx->forwardID = $repeat->uri; $ctx->forwardID = $repeat->uri;
$ctx->forwardUrl = $repeat->bestUrl(); $ctx->forwardUrl = $repeat->bestUrl();
} }
$act->context = $ctx; $act->context = $ctx;
// Source // Source
...@@ -1349,7 +1349,7 @@ class Notice extends Memcached_DataObject ...@@ -1349,7 +1349,7 @@ class Notice extends Memcached_DataObject
if (!empty($atom_feed)) { if (!empty($atom_feed)) {
$act->source = new ActivitySource(); $act->source = new ActivitySource();
// XXX: we should store the actual feed ID // XXX: we should store the actual feed ID
$act->source->id = $atom_feed; $act->source->id = $atom_feed;
...@@ -1362,7 +1362,7 @@ class Notice extends Memcached_DataObject ...@@ -1362,7 +1362,7 @@ class Notice extends Memcached_DataObject
$act->source->links['self'] = $atom_feed; $act->source->links['self'] = $atom_feed;
$act->source->icon = $profile->avatarUrl(AVATAR_PROFILE_SIZE); $act->source->icon = $profile->avatarUrl(AVATAR_PROFILE_SIZE);
$notice = $profile->getCurrentNotice(); $notice = $profile->getCurrentNotice();
if (!empty($notice)) { if (!empty($notice)) {
...@@ -1384,7 +1384,7 @@ class Notice extends Memcached_DataObject ...@@ -1384,7 +1384,7 @@ class Notice extends Memcached_DataObject
Event::handle('EndNoticeAsActivity', array($this, &$act)); Event::handle('EndNoticeAsActivity', array($this, &$act));
} }
self::cacheSet(Cache::codeKey('notice:as-activity:'.$this->id), $act); self::cacheSet(Cache::codeKey('notice:as-activity:'.$this->id), $act);
return $act; return $act;
...@@ -1395,7 +1395,7 @@ class Notice extends Memcached_DataObject ...@@ -1395,7 +1395,7 @@ class Notice extends Memcached_DataObject
function asAtomEntry($namespace=false, function asAtomEntry($namespace=false,
$source=false, $source=false,
$author=true, $author=true,
$cur=null) $cur=null)
{ {
$act = $this->asActivity(); $act = $this->asActivity();
...@@ -1405,7 +1405,7 @@ class Notice extends Memcached_DataObject ...@@ -1405,7 +1405,7 @@ class Notice extends Memcached_DataObject
/** /**
* Extra notice info for atom entries * Extra notice info for atom entries
* *
* Clients use some extra notice info in the atom stream. * Clients use some extra notice info in the atom stream.
* This gives it to them. * This gives it to them.
* *
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* Copyright (C) 2010, StatusNet, Inc. * Copyright (C) 2010, StatusNet, Inc.
* *
* A class for moving an account to a new server * A class for moving an account to a new server
* *
* PHP version 5 * PHP version 5
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
...@@ -44,7 +44,6 @@ if (!defined('STATUSNET')) { ...@@ -44,7 +44,6 @@ if (!defined('STATUSNET')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/ * @link http://status.net/
*/ */
class AccountMover extends QueueHandler class AccountMover extends QueueHandler
{ {
function transport() function transport()
...@@ -61,14 +60,16 @@ class AccountMover extends QueueHandler ...@@ -61,14 +60,16 @@ class AccountMover extends QueueHandler
$oprofile = Ostatus_profile::ensureProfileURI($remote); $oprofile = Ostatus_profile::ensureProfileURI($remote);
if (empty($oprofile)) { if (empty($oprofile)) {
throw new Exception("Can't locate account {$remote}"); // TRANS: Exception thrown when an account could not be located when it should be moved.
// TRANS: %s is the remote site.
throw new Exception(sprintf(_("Cannot locate account %s."),$remote));
} }
list($svcDocUrl, $username) = self::getServiceDocument($remote); list($svcDocUrl, $username) = self::getServiceDocument($remote);
$sink = new ActivitySink($svcDocUrl, $username, $password); $sink = new ActivitySink($svcDocUrl, $username, $password);
$this->log(LOG_INFO, $this->log(LOG_INFO,
"Moving user {$user->nickname} ". "Moving user {$user->nickname} ".
"to {$remote}."); "to {$remote}.");
...@@ -100,8 +101,10 @@ class AccountMover extends QueueHandler ...@@ -100,8 +101,10 @@ class AccountMover extends QueueHandler
$xrd = $discovery->lookup($remote); $xrd = $discovery->lookup($remote);
if (empty($xrd)) { if (empty($xrd)) {
throw new Exception("Can't find XRD for $remote"); // TRANS: Exception thrown when a service document could not be located account move.
} // TRANS: %s is the remote site.
throw new Exception(sprintf(_("Cannot find XRD for %s."),$remote));
}
$svcDocUrl = null; $svcDocUrl = null;
$username = null; $username = null;
...@@ -123,7 +126,9 @@ class AccountMover extends QueueHandler ...@@ -123,7 +126,9 @@ class AccountMover extends QueueHandler
} }
if (empty($svcDocUrl)) { if (empty($svcDocUrl)) {
throw new Exception("No AtomPub API service for $remote."); // TRANS: Exception thrown when an account could not be located when it should be moved.
// TRANS: %s is the remote site.
throw new Exception(sprintf(_("No AtomPub API service for %s."),$remote));
} }
return array($svcDocUrl, $username); return array($svcDocUrl, $username);
...@@ -131,7 +136,7 @@ class AccountMover extends QueueHandler ...@@ -131,7 +136,7 @@ class AccountMover extends QueueHandler
/** /**
* Log some data * Log some data
* *
* Add a header for our class so we know who did it. * Add a header for our class so we know who did it.
* *
* @param int $level Log level, like LOG_ERR or LOG_INFO * @param int $level Log level, like LOG_ERR or LOG_INFO
...@@ -139,7 +144,6 @@ class AccountMover extends QueueHandler ...@@ -139,7 +144,6 @@ class AccountMover extends QueueHandler
* *
* @return void * @return void
*/ */
protected function log($level, $message) protected function log($level, $message)
{ {
common_log($level, "AccountMover: " . $message); common_log($level, "AccountMover: " . $message);
......
...@@ -370,11 +370,11 @@ class Activity ...@@ -370,11 +370,11 @@ class Activity
$xs->element('title', null, $this->title); $xs->element('title', null, $this->title);
$xs->element('content', array('type' => 'html'), $this->content); $xs->element('content', array('type' => 'html'), $this->content);
if (!empty($this->summary)) { if (!empty($this->summary)) {
$xs->element('summary', null, $this->summary); $xs->element('summary', null, $this->summary);
} }
if (!empty($this->link)) { if (!empty($this->link)) {
$xs->element('link', array('rel' => 'alternate', $xs->element('link', array('rel' => 'alternate',
'type' => 'text/html'), 'type' => 'text/html'),
...@@ -386,10 +386,10 @@ class Activity ...@@ -386,10 +386,10 @@ class Activity
$xs->element('activity:verb', null, $this->verb); $xs->element('activity:verb', null, $this->verb);
$published = self::iso8601Date($this->time); $published = self::iso8601Date($this->time);
$xs->element('published', null, $published); $xs->element('published', null, $published);
$xs->element('updated', null, $published); $xs->element('updated', null, $published);
if ($author) { if ($author) {
$this->actor->outputTo($xs, 'author'); $this->actor->outputTo($xs, 'author');
} }
...@@ -458,7 +458,7 @@ class Activity ...@@ -458,7 +458,7 @@ class Activity
} }
// can be either URLs or enclosure objects // can be either URLs or enclosure objects
foreach ($this->enclosures as $enclosure) { foreach ($this->enclosures as $enclosure) {
if (is_string($enclosure)) { if (is_string($enclosure)) {
$xs->element('link', array('rel' => 'enclosure', $xs->element('link', array('rel' => 'enclosure',
...@@ -479,7 +479,7 @@ class Activity ...@@ -479,7 +479,7 @@ class Activity
if ($source && !empty($this->source)) { if ($source && !empty($this->source)) {
$xs->elementStart('source'); $xs->elementStart('source');
$xs->element('id', null, $this->source->id); $xs->element('id', null, $this->source->id);
$xs->element('title', null, $this->source->title); $xs->element('title', null, $this->source->title);
...@@ -488,7 +488,7 @@ class Activity ...@@ -488,7 +488,7 @@ class Activity
'type' => 'text/html', 'type' => 'text/html',
'href' => $this->source->links['alternate'])); 'href' => $this->source->links['alternate']));
} }
if (array_key_exists('self', $this->source->links)) { if (array_key_exists('self', $this->source->links)) {
$xs->element('link', array('rel' => 'self', $xs->element('link', array('rel' => 'self',
'type' => 'application/atom+xml', 'type' => 'application/atom+xml',
...@@ -507,7 +507,7 @@ class Activity ...@@ -507,7 +507,7 @@ class Activity
if (!empty($this->source->updated)) { if (!empty($this->source->updated)) {
$xs->element('updated', null, $this->source->updated); $xs->element('updated', null, $this->source->updated);
} }
$xs->elementEnd('source'); $xs->elementEnd('source');
} }
...@@ -524,7 +524,7 @@ class Activity ...@@ -524,7 +524,7 @@ class Activity
} }
// For throwing in extra elements; used for statusnet:notice_info // For throwing in extra elements; used for statusnet:notice_info
foreach ($this->extra as $el) { foreach ($this->extra as $el) {
list($tag, $attrs, $content) = $el; list($tag, $attrs, $content) = $el;
$xs->element($tag, $attrs, $content); $xs->element($tag, $attrs, $content);
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* Copyright (C) 2010, StatusNet, Inc. * Copyright (C) 2010, StatusNet, Inc.
* *
* Title of module * Title of module
* *
* PHP version 5 * PHP version 5
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
...@@ -44,14 +44,13 @@ if (!defined('STATUSNET')) { ...@@ -44,14 +44,13 @@ if (!defined('STATUSNET')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/ * @link http://status.net/
*/ */
class ActivityMover extends QueueHandler class ActivityMover extends QueueHandler
{ {
function transport() function transport()
{ {
return 'actmove'; return 'actmove';
} }
function handle($data) function handle($data)
{ {
list ($act, $sink, $userURI, $remoteURI) = $data; list ($act, $sink, $userURI, $remoteURI) = $data;
...@@ -82,7 +81,7 @@ class ActivityMover extends QueueHandler ...@@ -82,7 +81,7 @@ class ActivityMover extends QueueHandler
function moveActivity($act, $sink, $user, $remote) function moveActivity($act, $sink, $user, $remote)
{ {
if (empty($user)) { if (empty($user)) {
throw new Exception("No such user {$act->actor->id}"); throw new Exception(sprintf(_("No such user %s."),$act->actor->id));
} }
switch ($act->verb) { switch ($act->verb) {
...@@ -152,7 +151,7 @@ class ActivityMover extends QueueHandler ...@@ -152,7 +151,7 @@ class ActivityMover extends QueueHandler
/** /**
* Log some data * Log some data
* *
* Add a header for our class so we know who did it. * Add a header for our class so we know who did it.
* *
* @param int $level Log level, like LOG_ERR or LOG_INFO * @param int $level Log level, like LOG_ERR or LOG_INFO
...@@ -160,7 +159,6 @@ class ActivityMover extends QueueHandler ...@@ -160,7 +159,6 @@ class ActivityMover extends QueueHandler
* *
* @return void * @return void
*/ */
protected function log($level, $message) protected function log($level, $message)
{ {
common_log($level, "ActivityMover: " . $message); common_log($level, "ActivityMover: " . $message);
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* Copyright (C) 2010, StatusNet, Inc. * Copyright (C) 2010, StatusNet, Inc.
* *
* A remote, atompub-receiving service * A remote, atompub-receiving service
* *
* PHP version 5 * PHP version 5
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
...@@ -44,7 +44,6 @@ if (!defined('STATUSNET')) { ...@@ -44,7 +44,6 @@ if (!defined('STATUSNET')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/ * @link http://status.net/
*/ */
class ActivitySink class ActivitySink
{ {
protected $svcDocUrl = null; protected $svcDocUrl = null;
...@@ -104,6 +103,7 @@ class ActivitySink ...@@ -104,6 +103,7 @@ class ActivitySink
break; break;
} }
} }
if (!$takesEntries) { if (!$takesEntries) {
continue; continue;
} }
...@@ -158,12 +158,18 @@ class ActivitySink ...@@ -158,12 +158,18 @@ class ActivitySink
if ($status >= 200 && $status < 300) { if ($status >= 200 && $status < 300) {
return true; return true;
} else if ($status >= 400 && $status < 500) { } else if ($status >= 400 && $status < 500) {
throw new ClientException("{$url} {$status} {$reason}"); // TRANS: Client exception thrown when post to collection fails with a 400 status.
// TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
throw new ClientException(sprintf(_m('URLSTATUSREASON','%1$s %2$s %3$s'), $url, $status, $reason));
} else if ($status >= 500 && $status < 600) { } else if ($status >= 500 && $status < 600) {
throw new ServerException("{$url} {$status} {$reason}"); // TRANS: Server exception thrown when post to collection fails with a 500 status.
// TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
throw new ServerException(sprintf(_m('URLSTATUSREASON','%1$s %2$s %3$s'), $url, $status, $reason));
} else { } else {
// That's unexpected. // That's unexpected.
throw new Exception("{$url} {$status} {$reason}"); // TRANS: Exception thrown when post to collection fails with a status that is not handled.
// TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
throw new Exception(sprintf(_m('URLSTATUSREASON','%1$s %2$s %3$s'), $url, $status, $reason));
} }
} }
} }
...@@ -45,7 +45,6 @@ if (!defined('STATUSNET')) { ...@@ -45,7 +45,6 @@ if (!defined('STATUSNET')) {
* *
* @see http://groups.google.com/group/webfinger/browse_thread/thread/9f3d93a479e91bbf * @see http://groups.google.com/group/webfinger/browse_thread/thread/9f3d93a479e91bbf
*/ */
class Discovery class Discovery
{ {
const LRDD_REL = 'lrdd'; const LRDD_REL = 'lrdd';
...@@ -72,12 +71,11 @@ class Discovery ...@@ -72,12 +71,11 @@ class Discovery
/** /**
* Register a discovery class * Register a discovery class
* *
* @param string $class Class name * @param string $class Class name
* *
* @return void * @return void
*/ */
public function registerMethod($class) public function registerMethod($class)
{ {
$this->methods[] = $class; $this->methods[] = $class;
...@@ -91,7 +89,6 @@ class Discovery ...@@ -91,7 +89,6 @@ class Discovery
* *
* @return string normalized acct: or http(s)?: URI * @return string normalized acct: or http(s)?: URI
*/ */
public static function normalize($user_id) public static function normalize($user_id)
{