Fix "$s"s that slipped into double-quoted translatable strings' '%1$s' pattern. Switc...

diff --git a/actions/atompubfavoritefeed.php b/actions/atompubfavoritefeed.php
index d35bd9f53e804d3a7260cd5379953e968ce93dfa..c31fcbd72ac9d7ce498ae01ee6f7fc1fb55d612d 100644 (file)
--- a/actions/atompubfavoritefeed.php
+++ b/actions/atompubfavoritefeed.php
@@ -144,7 +144,7 @@ class AtompubfavoritefeedAction extends ApiAuthAction
 
         // TRANS: Subtitle for Atom favorites feed.
         // TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-        $feed->setSubtitle(sprintf(_("Notices %1$s has favorited on %2$s"),
+        $feed->setSubtitle(sprintf(_('Notices %1$s has favorited on %2$s'),
                                    $this->_profile->getBestName(),
                                    common_config('site', 'name')));
 

diff --git a/actions/atompubmembershipfeed.php b/actions/atompubmembershipfeed.php
index 57cf465a0c13373fa791dd89a45faf24b54da6a9..b52583314dc6bef2f9a0411b92a02e67fb6cd225 100644 (file)
--- a/actions/atompubmembershipfeed.php
+++ b/actions/atompubmembershipfeed.php
@@ -146,7 +146,7 @@ class AtompubmembershipfeedAction extends ApiAuthAction
 
         // TRANS: Subtitle for group membership feed.
         // TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-        $feed->setSubtitle(sprintf(_("Groups %1$s is a member of on %2$s"),
+        $feed->setSubtitle(sprintf(_('Groups %1$s is a member of on %2$s'),
                                    $this->_profile->getBestName(),
                                    common_config('site', 'name')));
 

diff --git a/actions/atompubsubscriptionfeed.php b/actions/atompubsubscriptionfeed.php
index 1b22efeac36168a69c26bf073e564cf3a93ae192..26740da835c212b38b177cd61559ead97a279fd1 100644 (file)
--- 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')));
 

diff --git a/lib/activityimporter.php b/lib/activityimporter.php
index 0bd7620da30b2247bf43e1c88f3e340eab5cef06..aa9b95e084c6b80fb54f717e3ecbde991e90c212 100644 (file)
--- a/lib/activityimporter.php
+++ b/lib/activityimporter.php
@@ -198,8 +198,8 @@ class ActivityImporter extends QueueHandler
                 } else {
                     // TRANS: Client exception thrown when trying to import a notice by another user.
                     // TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
-                    throw new ClientException(sprintf(_("Already know about notice %1$s and ".
-                                                        " it has a different author %2$s."),
+                    throw new ClientException(sprintf(_('Already know about notice %1$s and '.
+                                                        ' it has a different author %2$s.'),
                                                       $sourceUri, $uri));
                 }
             } else {