* i18n/L10n updates and FIXMEs added

* whitespace fixes
This commit is contained in:
Siebrand Mazeland 2010-09-03 01:35:04 +02:00
parent e365e709c5
commit 1bfbe9badf
26 changed files with 147 additions and 114 deletions

View File

@ -564,7 +564,9 @@ class OStatusPlugin extends Plugin
$act->time = time(); $act->time = time();
$act->title = _("Follow"); $act->title = _("Follow");
$act->content = sprintf(_("%s is now following %s."), // TRANS: Success message for subscribe to user attempt through OStatus.
// TRANS: %1$s is the subscriber name, %2$s is the subscribed user's name.
$act->content = sprintf(_("%1$s is now following %2$s."),
$subscriber->getBestName(), $subscriber->getBestName(),
$other->getBestName()); $other->getBestName());
@ -612,7 +614,9 @@ class OStatusPlugin extends Plugin
$act->time = time(); $act->time = time();
$act->title = _("Unfollow"); $act->title = _("Unfollow");
$act->content = sprintf(_("%s stopped following %s."), // TRANS: Success message for unsubscribe from user attempt through OStatus.
// TRANS: %1$s is the unsubscriber's name, %2$s is the unsubscribed user's name.
$act->content = sprintf(_("%1$s stopped following %2$s."),
$profile->getBestName(), $profile->getBestName(),
$other->getBestName()); $other->getBestName());
@ -657,7 +661,9 @@ class OStatusPlugin extends Plugin
$act->time = time(); $act->time = time();
$act->title = _m("Join"); $act->title = _m("Join");
$act->content = sprintf(_m("%s has joined group %s."), // TRANS: Success message for subscribe to group attempt through OStatus.
// TRANS: %1$s is the member name, %2$s is the subscribed group's name.
$act->content = sprintf(_m("%1$s has joined group %2$s."),
$member->getBestName(), $member->getBestName(),
$oprofile->getBestName()); $oprofile->getBestName());
@ -706,7 +712,9 @@ class OStatusPlugin extends Plugin
$act->time = time(); $act->time = time();
$act->title = _m("Leave"); $act->title = _m("Leave");
$act->content = sprintf(_m("%s has left group %s."), // TRANS: Success message for unsubscribe from group attempt through OStatus.
// TRANS: %1$s is the member name, %2$s is the unsubscribed group's name.
$act->content = sprintf(_m("%1$s has left group %2$s."),
$member->getBestName(), $member->getBestName(),
$oprofile->getBestName()); $oprofile->getBestName());
@ -746,7 +754,9 @@ class OStatusPlugin extends Plugin
$act->time = time(); $act->time = time();
$act->title = _("Favor"); $act->title = _("Favor");
$act->content = sprintf(_("%s marked notice %s as a favorite."), // TRANS: Success message for adding a favorite notice through OStatus.
// TRANS: %1$s is the favoring user's name, %2$s is URI to the favored notice.
$act->content = sprintf(_("%1$s marked notice %2$s as a favorite."),
$profile->getBestName(), $profile->getBestName(),
$notice->uri); $notice->uri);
@ -790,7 +800,9 @@ class OStatusPlugin extends Plugin
common_date_iso8601(time())); common_date_iso8601(time()));
$act->time = time(); $act->time = time();
$act->title = _("Disfavor"); $act->title = _("Disfavor");
$act->content = sprintf(_("%s marked notice %s as no longer a favorite."), // TRANS: Success message for remove a favorite notice through OStatus.
// TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice.
$act->content = sprintf(_("%1$s marked notice %2$s as no longer a favorite."),
$profile->getBestName(), $profile->getBestName(),
$notice->uri); $notice->uri);
@ -865,7 +877,7 @@ class OStatusPlugin extends Plugin
'class' => 'entity_subscribe')); 'class' => 'entity_subscribe'));
$action->element('a', array('href' => common_local_url($target), $action->element('a', array('href' => common_local_url($target),
'class' => 'entity_remote_subscribe') 'class' => 'entity_remote_subscribe')
, _m('Remote')); , _m('Remote')); // @todo: i18n: Add translator hint for this text.
$action->elementEnd('p'); $action->elementEnd('p');
$action->elementEnd('div'); $action->elementEnd('div');
} }
@ -905,6 +917,8 @@ class OStatusPlugin extends Plugin
common_date_iso8601(time())); common_date_iso8601(time()));
$act->time = time(); $act->time = time();
$act->title = _m("Profile update"); $act->title = _m("Profile update");
// TRANS: Ping text for remote profile update through OStatus.
// TRANS: %s is user that updated their profile.
$act->content = sprintf(_m("%s has updated their profile page."), $act->content = sprintf(_m("%s has updated their profile page."),
$profile->getBestName()); $profile->getBestName());
@ -934,7 +948,7 @@ class OStatusPlugin extends Plugin
array('nickname' => $profileUser->nickname)); array('nickname' => $profileUser->nickname));
$output->element('a', array('href' => $url, $output->element('a', array('href' => $url,
'class' => 'entity_remote_subscribe'), 'class' => 'entity_remote_subscribe'),
_m('Subscribe')); _m('Subscribe')); // @todo: i18n: Add context.
$output->elementEnd('li'); $output->elementEnd('li');
} }
} }
@ -950,7 +964,7 @@ class OStatusPlugin extends Plugin
'homepage' => 'http://status.net/wiki/Plugin:OStatus', 'homepage' => 'http://status.net/wiki/Plugin:OStatus',
'rawdescription' => 'rawdescription' =>
_m('Follow people across social networks that implement '. _m('Follow people across social networks that implement '.
'<a href="http://ostatus.org/">OStatus</a>.')); '<a href="http://ostatus.org/">OStatus</a>.')); // @todo i18n: Add translator hint.
return true; return true;
} }

View File

@ -74,7 +74,7 @@ class OStatusGroupAction extends OStatusSubAction
$this->input('profile', $this->input('profile',
_m('Join group'), _m('Join group'),
$this->profile_uri, $this->profile_uri,
_m("OStatus group's address, like http://example.net/group/nickname")); _m("OStatus group's address, like http://example.net/group/nickname."));
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementEnd('ul'); $this->elementEnd('ul');

View File

@ -109,12 +109,12 @@ class OStatusInitAction extends Action
$this->elementStart('ul', 'form_data'); $this->elementStart('ul', 'form_data');
$this->elementStart('li', array('id' => 'ostatus_nickname')); $this->elementStart('li', array('id' => 'ostatus_nickname'));
$this->input('nickname', _m('User nickname'), $this->nickname, $this->input('nickname', _m('User nickname'), $this->nickname,
_m('Nickname of the user you want to follow')); _m('Nickname of the user you want to follow.'));
$this->hidden('group', $this->group); // pass-through for magic links $this->hidden('group', $this->group); // pass-through for magic links
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementStart('li', array('id' => 'ostatus_profile')); $this->elementStart('li', array('id' => 'ostatus_profile'));
$this->input('profile', _m('Profile Account'), $this->profile, $this->input('profile', _m('Profile Account'), $this->profile,
_m('Your account id (i.e. user@identi.ca)')); _m('Your account id (e.g. user@identi.ca).'));
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementEnd('ul'); $this->elementEnd('ul');
$this->submit('submit', $submit); $this->submit('submit', $submit);

View File

@ -64,11 +64,11 @@ class OStatusSubAction extends Action
$this->input('profile', $this->input('profile',
_m('Subscribe to'), _m('Subscribe to'),
$this->profile_uri, $this->profile_uri,
_m("OStatus user's address, like nickname@example.com or http://example.net/nickname")); _m("OStatus user's address, like nickname@example.com or http://example.net/nickname")); // @todo i18n FIXME: needs context/translator hint.
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementEnd('ul'); $this->elementEnd('ul');
$this->submit('validate', _m('Continue')); $this->submit('validate', _m('Continue')); // @todo i18n FIXME: needs context/translator hint.
$this->elementEnd('fieldset'); $this->elementEnd('fieldset');
@ -103,10 +103,10 @@ class OStatusSubAction extends Action
$this->hidden('profile', $this->profile_uri); $this->hidden('profile', $this->profile_uri);
if ($this->oprofile->isGroup()) { if ($this->oprofile->isGroup()) {
$this->submit('submit', _m('Join'), 'submit', null, $this->submit('submit', _m('Join'), 'submit', null,
_m('Join this group')); _m('Join this group')); // @todo i18n FIXME: needs context/translator hint.
} else { } else {
$this->submit('submit', _m('Confirm'), 'submit', null, $this->submit('submit', _m('Confirm'), 'submit', null,
_m('Subscribe to this user')); _m('Subscribe to this user')); // @todo i18n FIXME: needs context/translator hint.
} }
$this->elementEnd('fieldset'); $this->elementEnd('fieldset');
$this->elementEnd('form'); $this->elementEnd('form');
@ -244,13 +244,13 @@ class OStatusSubAction extends Action
} else if (Validate::uri($this->profile_uri)) { } else if (Validate::uri($this->profile_uri)) {
$this->oprofile = Ostatus_profile::ensureProfileURL($this->profile_uri); $this->oprofile = Ostatus_profile::ensureProfileURL($this->profile_uri);
} else { } else {
$this->error = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname"); $this->error = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname.");
common_debug('Invalid address format.', __FILE__); common_debug('Invalid address format.', __FILE__);
return false; return false;
} }
return true; return true;
} catch (FeedSubBadURLException $e) { } catch (FeedSubBadURLException $e) {
$this->error = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname"); $this->error = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname.");
common_debug('Invalid URL or could not reach server.', __FILE__); common_debug('Invalid URL or could not reach server.', __FILE__);
} catch (FeedSubBadResponseException $e) { } catch (FeedSubBadResponseException $e) {
$this->error = _m("Sorry, we could not reach that feed. Please try that OStatus address again later."); $this->error = _m("Sorry, we could not reach that feed. Please try that OStatus address again later.");
@ -269,7 +269,7 @@ class OStatusSubAction extends Action
common_debug('Not a recognized feed type.', __FILE__); common_debug('Not a recognized feed type.', __FILE__);
} catch (Exception $e) { } catch (Exception $e) {
// Any new ones we forgot about // Any new ones we forgot about
$this->error = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname"); $this->error = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname.");
common_debug(sprintf('Bad feed URL: %s %s', get_class($e), $e->getMessage()), __FILE__); common_debug(sprintf('Bad feed URL: %s %s', get_class($e), $e->getMessage()), __FILE__);
} }

View File

@ -46,11 +46,12 @@ class PushCallbackAction extends Action
$feedid = $this->arg('feed'); $feedid = $this->arg('feed');
common_log(LOG_INFO, "POST for feed id $feedid"); common_log(LOG_INFO, "POST for feed id $feedid");
if (!$feedid) { if (!$feedid) {
throw new ServerException('Empty or invalid feed id', 400); throw new ServerException('Empty or invalid feed id.', 400);
} }
$feedsub = FeedSub::staticGet('id', $feedid); $feedsub = FeedSub::staticGet('id', $feedid);
if (!$feedsub) { if (!$feedsub) {
// @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new ServerException('Unknown PuSH feed id ' . $feedid, 400); throw new ServerException('Unknown PuSH feed id ' . $feedid, 400);
} }
@ -88,20 +89,24 @@ class PushCallbackAction extends Action
$feedsub = FeedSub::staticGet('uri', $topic); $feedsub = FeedSub::staticGet('uri', $topic);
if (!$feedsub) { if (!$feedsub) {
throw new ClientException("Bad hub.topic feed $topic", 404); // @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new ClientException("Bad hub.topic feed $topic.", 404);
} }
if ($feedsub->verify_token !== $verify_token) { if ($feedsub->verify_token !== $verify_token) {
throw new ClientException("Bad hub.verify_token $token for $topic", 404); // @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new ClientException("Bad hub.verify_token $token for $topic.", 404);
} }
if ($mode == 'subscribe') { if ($mode == 'subscribe') {
// We may get re-sub requests legitimately. // We may get re-sub requests legitimately.
if ($feedsub->sub_state != 'subscribe' && $feedsub->sub_state != 'active') { if ($feedsub->sub_state != 'subscribe' && $feedsub->sub_state != 'active') {
// @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new ClientException("Unexpected subscribe request for $topic.", 404); throw new ClientException("Unexpected subscribe request for $topic.", 404);
} }
} else { } else {
if ($feedsub->sub_state != 'unsubscribe') { if ($feedsub->sub_state != 'unsubscribe') {
// @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new ClientException("Unexpected unsubscribe request for $topic.", 404); throw new ClientException("Unexpected unsubscribe request for $topic.", 404);
} }
} }

View File

@ -36,7 +36,6 @@ Things to consider...
*/ */
class PushHubAction extends Action class PushHubAction extends Action
{ {
function arg($arg, $def=null) function arg($arg, $def=null)
@ -63,8 +62,10 @@ class PushHubAction extends Action
$this->subunsub($mode); $this->subunsub($mode);
break; break;
case "publish": case "publish":
// @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new ClientException("Publishing outside feeds not supported.", 400); throw new ClientException("Publishing outside feeds not supported.", 400);
default: default:
// @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new ClientException("Unrecognized mode '$mode'.", 400); throw new ClientException("Unrecognized mode '$mode'.", 400);
} }
} }
@ -84,16 +85,19 @@ class PushHubAction extends Action
$topic = $this->argUrl('hub.topic'); $topic = $this->argUrl('hub.topic');
if (!$this->recognizedFeed($topic)) { if (!$this->recognizedFeed($topic)) {
// @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new ClientException("Unsupported hub.topic $topic; this hub only serves local user and group Atom feeds."); throw new ClientException("Unsupported hub.topic $topic; this hub only serves local user and group Atom feeds.");
} }
$verify = $this->arg('hub.verify'); // @fixme may be multiple $verify = $this->arg('hub.verify'); // @fixme may be multiple
if ($verify != 'sync' && $verify != 'async') { if ($verify != 'sync' && $verify != 'async') {
// @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new ClientException("Invalid hub.verify $verify; must be sync or async."); throw new ClientException("Invalid hub.verify $verify; must be sync or async.");
} }
$lease = $this->arg('hub.lease_seconds', null); $lease = $this->arg('hub.lease_seconds', null);
if ($mode == 'subscribe' && $lease != '' && !preg_match('/^\d+$/', $lease)) { if ($mode == 'subscribe' && $lease != '' && !preg_match('/^\d+$/', $lease)) {
// @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new ClientException("Invalid hub.lease $lease; must be empty or positive integer."); throw new ClientException("Invalid hub.lease $lease; must be empty or positive integer.");
} }
@ -101,6 +105,7 @@ class PushHubAction extends Action
$secret = $this->arg('hub.secret', null); $secret = $this->arg('hub.secret', null);
if ($secret != '' && strlen($secret) >= 200) { if ($secret != '' && strlen($secret) >= 200) {
// @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new ClientException("Invalid hub.secret $secret; must be under 200 bytes."); throw new ClientException("Invalid hub.secret $secret; must be under 200 bytes.");
} }
@ -152,6 +157,7 @@ class PushHubAction extends Action
if ($feed == $userFeed) { if ($feed == $userFeed) {
$user = User::staticGet('id', $id); $user = User::staticGet('id', $id);
if (!$user) { if (!$user) {
// @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new ClientException("Invalid hub.topic $feed; user doesn't exist."); throw new ClientException("Invalid hub.topic $feed; user doesn't exist.");
} else { } else {
return true; return true;
@ -160,6 +166,7 @@ class PushHubAction extends Action
if ($feed == $groupFeed) { if ($feed == $groupFeed) {
$user = User_group::staticGet('id', $id); $user = User_group::staticGet('id', $id);
if (!$user) { if (!$user) {
// @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new ClientException("Invalid hub.topic $feed; group doesn't exist."); throw new ClientException("Invalid hub.topic $feed; group doesn't exist.");
} else { } else {
return true; return true;
@ -183,6 +190,7 @@ class PushHubAction extends Action
if (Validate::uri($url, $params)) { if (Validate::uri($url, $params)) {
return $url; return $url;
} else { } else {
// @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new ClientException("Invalid URL passed for $arg: '$url'"); throw new ClientException("Invalid URL passed for $arg: '$url'");
} }
} }
@ -199,4 +207,3 @@ class PushHubAction extends Action
return HubSub::staticGet($feed, $callback); return HubSub::staticGet($feed, $callback);
} }
} }

View File

@ -249,7 +249,7 @@ class FeedSub extends Memcached_DataObject
// We'll never actually get updates in this mode. // We'll never actually get updates in this mode.
return true; return true;
} else { } else {
throw new ServerException("Attempting to start PuSH subscription for feed with no hub"); throw new ServerException("Attempting to start PuSH subscription for feed with no hub.");
} }
} }
@ -279,7 +279,7 @@ class FeedSub extends Memcached_DataObject
// We'll never actually get updates in this mode. // We'll never actually get updates in this mode.
return true; return true;
} else { } else {
throw new ServerException("Attempting to end PuSH subscription for feed with no hub"); throw new ServerException("Attempting to end PuSH subscription for feed with no hub.");
} }
} }
@ -502,4 +502,3 @@ class FeedSub extends Memcached_DataObject
} }
} }

View File

@ -206,6 +206,7 @@ class HubSub extends Memcached_DataObject
if ($status >= 200 && $status < 300) { if ($status >= 200 && $status < 300) {
common_log(LOG_INFO, "Verified $mode of $this->callback:$this->topic"); common_log(LOG_INFO, "Verified $mode of $this->callback:$this->topic");
} else { } else {
// @todo i18n FIXME: add i18n and use sprintf for parameter.
throw new ClientException("Hub subscriber verification returned HTTP $status"); throw new ClientException("Hub subscriber verification returned HTTP $status");
} }
@ -359,4 +360,3 @@ class HubSub extends Memcached_DataObject
} }
} }
} }

View File

@ -223,5 +223,3 @@ class Magicsig extends Memcached_DataObject
return base64_decode(strtr($input, '-_', '+/')); return base64_decode(strtr($input, '-_', '+/'));
} }
} }

View File

@ -188,9 +188,11 @@ class Ostatus_profile extends Memcached_DataObject
} else if ($this->group_id && !$this->profile_id) { } else if ($this->group_id && !$this->profile_id) {
return true; return true;
} else if ($this->group_id && $this->profile_id) { } else if ($this->group_id && $this->profile_id) {
throw new ServerException("Invalid ostatus_profile state: both group and profile IDs set for $this->uri"); // @todo i18n FIXME: use sprintf and add i18n.
throw new ServerException("Invalid ostatus_profile state: both group and profile IDs set for $this->uri.");
} else { } else {
throw new ServerException("Invalid ostatus_profile state: both group and profile IDs empty for $this->uri"); // @todo i18n FIXME: use sprintf and add i18n.
throw new ServerException("Invalid ostatus_profile state: both group and profile IDs empty for $this->uri.");
} }
} }
@ -370,7 +372,8 @@ class Ostatus_profile extends Memcached_DataObject
} else if ($entry instanceof Notice) { } else if ($entry instanceof Notice) {
return $preamble . $entry->asAtomEntry(true, true); return $preamble . $entry->asAtomEntry(true, true);
} else { } else {
throw new ServerException("Invalid type passed to Ostatus_profile::notify; must be XML string or Activity entry"); // @todo i18n FIXME: use sprintf and add i18n.
throw new ServerException("Invalid type passed to Ostatus_profile::notify; must be XML string or Activity entry.");
} }
} }
@ -549,7 +552,8 @@ class Ostatus_profile extends Memcached_DataObject
$sourceContent = $note->title; $sourceContent = $note->title;
} else { } else {
// @fixme fetch from $sourceUrl? // @fixme fetch from $sourceUrl?
throw new ClientException("No content for notice {$sourceUri}"); // @todo i18n FIXME: use sprintf and add i18n.
throw new ClientException("No content for notice {$sourceUri}.");
} }
// Get (safe!) HTML and text versions of the content // Get (safe!) HTML and text versions of the content
@ -587,7 +591,7 @@ class Ostatus_profile extends Memcached_DataObject
' class="attachment more"' . ' class="attachment more"' .
' title="'. htmlspecialchars(_m('Show more')) . '">' . ' title="'. htmlspecialchars(_m('Show more')) . '">' .
'&#8230;' . '&#8230;' .
'</a>'; '</a>'; // @todo i18n FIXME: add translator hint/context.
} }
} }
@ -772,6 +776,7 @@ class Ostatus_profile extends Memcached_DataObject
$response = $client->get($profile_url); $response = $client->get($profile_url);
if (!$response->isOk()) { if (!$response->isOk()) {
// @todo i18n FIXME: use sprintf and add i18n.
throw new Exception("Could not reach profile page: " . $profile_url); throw new Exception("Could not reach profile page: " . $profile_url);
} }
@ -829,6 +834,7 @@ class Ostatus_profile extends Memcached_DataObject
return self::ensureFeedURL($feedurl, $hints); return self::ensureFeedURL($feedurl, $hints);
} }
// @todo i18n FIXME: use sprintf and add i18n.
throw new Exception("Could not find a feed URL for profile page " . $finalUrl); throw new Exception("Could not find a feed URL for profile page " . $finalUrl);
} }
@ -861,6 +867,7 @@ class Ostatus_profile extends Memcached_DataObject
$user = User::staticGet('id', $profile->id); $user = User::staticGet('id', $profile->id);
if (!empty($user)) { if (!empty($user)) {
// @todo i18n FIXME: use sprintf and add i18n.
throw new OStatusShadowException($profile, "'$profile_url' is the profile for local user '{$user->nickname}'."); throw new OStatusShadowException($profile, "'$profile_url' is the profile for local user '{$user->nickname}'.");
} }
@ -1025,7 +1032,7 @@ class Ostatus_profile extends Memcached_DataObject
return; return;
} }
if (!common_valid_http_url($url)) { if (!common_valid_http_url($url)) {
throw new ServerException(sprintf(_m("Invalid avatar URL %s"), $url)); throw new ServerException(sprintf(_m("Invalid avatar URL %s."), $url));
} }
if ($this->isGroup()) { if ($this->isGroup()) {
@ -1035,7 +1042,7 @@ class Ostatus_profile extends Memcached_DataObject
} }
if (!$self) { if (!$self) {
throw new ServerException(sprintf( throw new ServerException(sprintf(
_m("Tried to update avatar for unsaved remote profile %s"), _m("Tried to update avatar for unsaved remote profile %s."),
$this->uri)); $this->uri));
} }
@ -1043,7 +1050,7 @@ class Ostatus_profile extends Memcached_DataObject
// ripped from oauthstore.php (for old OMB client) // ripped from oauthstore.php (for old OMB client)
$temp_filename = tempnam(sys_get_temp_dir(), 'listener_avatar'); $temp_filename = tempnam(sys_get_temp_dir(), 'listener_avatar');
if (!copy($url, $temp_filename)) { if (!copy($url, $temp_filename)) {
throw new ServerException(sprintf(_m("Unable to fetch avatar from %s"), $url)); throw new ServerException(sprintf(_m("Unable to fetch avatar from %s."), $url));
} }
if ($this->isGroup()) { if ($this->isGroup()) {
@ -1226,7 +1233,7 @@ class Ostatus_profile extends Memcached_DataObject
if ($object->link && common_valid_http_url($object->link)) { if ($object->link && common_valid_http_url($object->link)) {
return $object->link; return $object->link;
} }
throw new ServerException("No author ID URI found"); throw new ServerException("No author ID URI found.");
} }
/** /**
@ -1256,10 +1263,12 @@ class Ostatus_profile extends Memcached_DataObject
$user = User::staticGet('uri', $homeuri); $user = User::staticGet('uri', $homeuri);
if ($user) { if ($user) {
// @todo i18n FIXME: add i18n.
throw new Exception("Local user can't be referenced as remote."); throw new Exception("Local user can't be referenced as remote.");
} }
if (OStatusPlugin::localGroupFromUrl($homeuri)) { if (OStatusPlugin::localGroupFromUrl($homeuri)) {
// @todo i18n FIXME: add i18n.
throw new Exception("Local group can't be referenced as remote."); throw new Exception("Local group can't be referenced as remote.");
} }
@ -1311,7 +1320,8 @@ class Ostatus_profile extends Memcached_DataObject
$oprofile->profile_id = $profile->insert(); $oprofile->profile_id = $profile->insert();
if (!$oprofile->profile_id) { if (!$oprofile->profile_id) {
throw new ServerException("Can't save local profile"); // @todo i18n FIXME: add i18n.
throw new ServerException("Can't save local profile.");
} }
} else { } else {
$group = new User_group(); $group = new User_group();
@ -1321,14 +1331,16 @@ class Ostatus_profile extends Memcached_DataObject
$oprofile->group_id = $group->insert(); $oprofile->group_id = $group->insert();
if (!$oprofile->group_id) { if (!$oprofile->group_id) {
throw new ServerException("Can't save local profile"); // @todo i18n FIXME: add i18n.
throw new ServerException("Can't save local profile.");
} }
} }
$ok = $oprofile->insert(); $ok = $oprofile->insert();
if (!$ok) { if (!$ok) {
throw new ServerException("Can't save OStatus profile"); // @todo i18n FIXME: add i18n.
throw new ServerException("Can't save OStatus profile.");
} }
$avatar = self::getActivityObjectAvatar($object, $hints); $avatar = self::getActivityObjectAvatar($object, $hints);
@ -1586,6 +1598,7 @@ class Ostatus_profile extends Memcached_DataObject
if ($uri !== false) { if ($uri !== false) {
if (is_null($uri)) { if (is_null($uri)) {
// Negative cache entry // Negative cache entry
// @todo i18n FIXME: add i18n.
throw new Exception('Not a valid webfinger address.'); throw new Exception('Not a valid webfinger address.');
} }
$oprofile = Ostatus_profile::staticGet('uri', $uri); $oprofile = Ostatus_profile::staticGet('uri', $uri);
@ -1613,6 +1626,7 @@ class Ostatus_profile extends Memcached_DataObject
// Save negative cache entry so we don't waste time looking it up again. // Save negative cache entry so we don't waste time looking it up again.
// @fixme distinguish temporary failures? // @fixme distinguish temporary failures?
self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), null); self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), null);
// @todo i18n FIXME: add i18n.
throw new Exception('Not a valid webfinger address.'); throw new Exception('Not a valid webfinger address.');
} }
@ -1694,7 +1708,8 @@ class Ostatus_profile extends Memcached_DataObject
if (!$profile_id) { if (!$profile_id) {
common_log_db_error($profile, 'INSERT', __FILE__); common_log_db_error($profile, 'INSERT', __FILE__);
throw new Exception("Couldn't save profile for '$addr'"); // @todo i18n FIXME: add i18n and use sprintf for parameter.
throw new Exception("Couldn't save profile for '$addr'.");
} }
$oprofile = new Ostatus_profile(); $oprofile = new Ostatus_profile();
@ -1712,13 +1727,15 @@ class Ostatus_profile extends Memcached_DataObject
if (!$result) { if (!$result) {
common_log_db_error($oprofile, 'INSERT', __FILE__); common_log_db_error($oprofile, 'INSERT', __FILE__);
throw new Exception("Couldn't save ostatus_profile for '$addr'"); // @todo i18n FIXME: add i18n and use sprintf for parameter.
throw new Exception("Couldn't save ostatus_profile for '$addr'.");
} }
self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri); self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri);
return $oprofile; return $oprofile;
} }
// @todo i18n FIXME: add i18n and use sprintf for parameter.
throw new Exception("Couldn't find a valid profile for '$addr'"); throw new Exception("Couldn't find a valid profile for '$addr'");
} }
@ -1818,4 +1835,3 @@ class OStatusShadowException extends Exception
parent::__construct($message); parent::__construct($message);
} }
} }

View File

@ -106,7 +106,8 @@ class Discovery
} }
} }
throw new Exception('Unable to find services for '. $id); // @todo Needs i18n.
throw new Exception('Unable to find services for '. $id '.');
} }
public static function getService($links, $service) { public static function getService($links, $service) {

View File

@ -51,4 +51,3 @@ class HubConfQueueHandler extends QueueHandler
return true; return true;
} }
} }

View File

@ -76,7 +76,7 @@ class MagicEnvelope
} }
} }
} }
throw new Exception('Unable to locate signer public key'); throw new Exception('Unable to locate signer public key.');
} }
@ -93,7 +93,6 @@ class MagicEnvelope
'alg' => $signature_alg->getName() 'alg' => $signature_alg->getName()
); );
} }
public function toXML($env) { public function toXML($env) {

View File

@ -223,4 +223,3 @@ class OStatusQueueHandler extends QueueHandler
} }
} }

View File

@ -89,7 +89,8 @@ class Salmon
$magickey->generate($user->id); $magickey->generate($user->id);
} }
} else { } else {
throw new Exception("Salmon invalid actor for signing"); // @todo i18n FIXME: added i18n and use sprintf when using parameters.
throw new Exception("Salmon invalid actor for signing.");
} }
try { try {

View File

@ -42,7 +42,7 @@ class SalmonAction extends Action
} }
if (empty($_SERVER['CONTENT_TYPE']) || $_SERVER['CONTENT_TYPE'] != 'application/magic-envelope+xml') { if (empty($_SERVER['CONTENT_TYPE']) || $_SERVER['CONTENT_TYPE'] != 'application/magic-envelope+xml') {
$this->clientError(_m('Salmon requires application/magic-envelope+xml')); $this->clientError(_m('Salmon requires "application/magic-envelope+xml".'));
} }
$xml = file_get_contents('php://input'); $xml = file_get_contents('php://input');

View File

@ -61,11 +61,11 @@ class XRD
error_reporting($old); error_reporting($old);
if (!$ok) { if (!$ok) {
throw new Exception("Invalid XML"); throw new Exception("Invalid XML.");
} }
$xrd_element = $dom->getElementsByTagName('XRD')->item(0); $xrd_element = $dom->getElementsByTagName('XRD')->item(0);
if (!$xrd_element) { if (!$xrd_element) {
throw new Exception("Invalid XML, missing XRD root"); throw new Exception("Invalid XML, missing XRD root.");
} }
// Check for host-meta host // Check for host-meta host
@ -169,4 +169,3 @@ class XRD
return $link; return $link;
} }
} }

View File

@ -26,7 +26,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
class XrdAction extends Action class XrdAction extends Action
{ {
public $uri; public $uri;
public $user; public $user;

View File

@ -93,4 +93,3 @@ if ($count && $dry) {
} else { } else {
echo "done.\n"; echo "done.\n";
} }

View File

@ -86,4 +86,3 @@ if ($skip || $count) {
} }
Event::handle('StartFeedSubReceive', array($sub, $feed)); Event::handle('StartFeedSubReceive', array($sub, $feed));

View File

@ -49,7 +49,7 @@ try {
$nickname = get_option_value('n', 'nickname'); $nickname = get_option_value('n', 'nickname');
$user = User::staticGet('nickname', $nickname); $user = User::staticGet('nickname', $nickname);
if (empty($user)) { if (empty($user)) {
throw new Exception("Can't find user with nickname '$nickname'"); throw new Exception("Can't find user with nickname '$nickname'.");
} }
updateOStatus($user); updateOStatus($user);
} else if (have_option('a', 'all')) { } else if (have_option('a', 'all')) {

View File

@ -552,4 +552,3 @@ $b = $args[1];
$tester = new OStatusTester($a, $b); $tester = new OStatusTester($a, $b);
$tester->run(); $tester->run();