X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fatompubsubscriptionfeed.php;h=26740da835c212b38b177cd61559ead97a279fd1;hb=382e4d2cdbd2dbfa211077fb9bce35441b8743cd;hp=43e7933272c77de7d95792b11dba1775944a565e;hpb=c0bb1a57984266024e8e5a968c0f3a3b54befff6;p=quix0rs-gnu-social.git diff --git a/actions/atompubsubscriptionfeed.php b/actions/atompubsubscriptionfeed.php index 43e7933272..26740da835 100644 --- a/actions/atompubsubscriptionfeed.php +++ b/actions/atompubsubscriptionfeed.php @@ -150,7 +150,7 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction // TRANS: Subtitle for Atom subscription feed. // TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename. - $feed->setSubtitle(sprintf(_("People %1$s has subscribed to on %2$s"), + $feed->setSubtitle(sprintf(_("People %1\$s has subscribed to on %2\$s"), $this->_profile->getBestName(), common_config('site', 'name'))); @@ -244,8 +244,7 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction if (Event::handle('StartAtomPubNewActivity', array(&$activity))) { if ($activity->verb != ActivityVerb::FOLLOW) { - // TRANS: Client error displayed when not using the POST verb. - // TRANS: Do not translate POST. + // TRANS: Client error displayed when not using the follow verb. $this->clientError(_('Can only handle Follow activities.')); return; } @@ -264,14 +263,17 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction if (empty($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)); return; } if (Subscription::exists($this->_profile, $profile)) { // 409 Conflict - $this->clientError(sprintf(_('Already subscribed to %s'), - $person->id), + // TRANS: Client error displayed trying to subscribe to an already subscribed profile. + // TRANS: %s is the profile the user already has a subscription on. + $this->clientError(sprintf(_('Already subscribed to %s.'), + $person->id), 409); return; }