From b46ce3b67d189d729a4a7679dfb6d6434190d392 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 31 Jan 2011 14:00:22 -0800
Subject: [PATCH] Fix "$s"s that slipped into double-quoted translatable
 strings' '%1$s' pattern. Switch to single-quote to fix.

---
 actions/atompubfavoritefeed.php     | 2 +-
 actions/atompubmembershipfeed.php   | 2 +-
 actions/atompubsubscriptionfeed.php | 2 +-
 lib/activityimporter.php            | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/actions/atompubfavoritefeed.php b/actions/atompubfavoritefeed.php
index d35bd9f53e..c31fcbd72a 100644
--- 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 57cf465a0c..b52583314d 100644
--- 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 1b22efeac3..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')));
 
diff --git a/lib/activityimporter.php b/lib/activityimporter.php
index 0bd7620da3..aa9b95e084 100644
--- 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 {