]> git.mxchange.org Git - quix0rs-gnu-social.git/blobdiff - actions/atompubsubscriptionfeed.php
Fix "$s"s that slipped into double-quoted translatable strings' '%1$s' pattern. Switc...
[quix0rs-gnu-social.git] / actions / atompubsubscriptionfeed.php
index 43e7933272c77de7d95792b11dba1775944a565e..26740da835c212b38b177cd61559ead97a279fd1 100644 (file)
@@ -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;
             }