Fix unescaped dollar signs in double-quoted strings due to localization updates ...

diff --git a/classes/Fave.php b/classes/Fave.php
index 059b339cd27a62e7b8deb8c8c05e7e353c6c9fcc..9922ae45c54bbc626965624f7bce05b9d9c0b735 100644 (file)
--- a/classes/Fave.php
+++ b/classes/Fave.php
@@ -148,7 +148,7 @@ class Fave extends Memcached_DataObject
         $act->title   = _("Favor");
         // TRANS: Ntofication given when a user marks a notice as favorite.
         // TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-        $act->content = sprintf(_("%1$s marked notice %2$s as a favorite."),
+        $act->content = sprintf(_('%1$s marked notice %2$s as a favorite.'),
                                $profile->getBestName(),
                                $notice->uri);
 

diff --git a/classes/Notice.php b/classes/Notice.php
index e268544b5089a619d76cb31316a207f1d18a11ae..60989f9bac12025688eb0b8922729d69456eefda 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1117,7 +1117,7 @@ class Notice extends Memcached_DataObject
                     common_log_db_error($reply, 'INSERT', __FILE__);
                     // TRANS: Server exception thrown when a reply cannot be saved.
                     // TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-                    throw new ServerException(sprintf(_("Could not save reply for %1$d, %2$d."), $this->id, $mentioned->id));
+                    throw new ServerException(sprintf(_('Could not save reply for %1$d, %2$d.'), $this->id, $mentioned->id));
                 } else {
                     $replied[$mentioned->id] = 1;
                     self::blow('reply:stream:%d', $mentioned->id);

diff --git a/classes/Subscription.php b/classes/Subscription.php
index b4dbd84c981d1c29ae426904b1af44852b9acdb5..e9ad2a5a208e727471db1d59b38b708f334b9998 100644 (file)
--- a/classes/Subscription.php
+++ b/classes/Subscription.php
@@ -255,7 +255,7 @@ class Subscription extends Memcached_DataObject
         $act->title   = _("Follow");
         // TRANS: Notification given when one person starts following another.
         // TRANS: %1$s is the subscriber, %2$s is the subscribed.
-        $act->content = sprintf(_("%1$s is now following %2$s."),
+        $act->content = sprintf(_('%1$s is now following %2$s.'),
                                $subscriber->getBestName(),
                                $subscribed->getBestName());
 

diff --git a/lib/mail.php b/lib/mail.php
index ab5742e33d0338ec96e6b13b9073cb3bfbc5e986..a3b3e05b827ff8e44c230734992610fc355abe13 100644 (file)
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -252,14 +252,14 @@ function mail_subscribe_notify_profile($listenee, $other)
 
         // TRANS: Main body of new-subscriber notification e-mail
         $body = sprintf(_('%1$s is now listening to your notices on %2$s.'."\n\n".
-                          "\t".'%3$s'."\n\n".
+                          "\t".'%3\$s'."\n\n".
                           '%4$s'.
                           '%5$s'.
                           '%6$s'.
-                          "\n".'Faithfully yours,'."\n".'%7$s.'."\n\n".
+                          "\n".'Faithfully yours,'."\n".'%7\$s.'."\n\n".
                           "----\n".
                           "Change your email address or ".
-                          "notification options at ".'%8$s' ."\n"),
+                          "notification options at ".'%8\$s' ."\n"),
                         $long_name,
                         common_config('site', 'name'),
                         $other->profileurl,

diff --git a/lib/usernoprofileexception.php b/lib/usernoprofileexception.php
index e0186fef971a05664bfc98a33984ca83789e5325..954d31b0d194378ae503d69dce5d1736bd1a9d3c 100644 (file)
--- a/lib/usernoprofileexception.php
+++ b/lib/usernoprofileexception.php
@@ -57,7 +57,7 @@ class UserNoProfileException extends ServerException
 
         // TRANS: Exception text shown when no profile can be found for a user.
         // TRANS: %1$s is a user nickname, $2$d is a user ID (number).
-        $message = sprintf(_("User %1$s (%2$d) has no profile record."),
+        $message = sprintf(_('User %1$s (%2$d) has no profile record.'),
                            $user->nickname, $user->id);
 
         parent::__construct($message);

diff --git a/plugins/Facebook/facebookhome.php b/plugins/Facebook/facebookhome.php
index 6090f988c536a5181f8c42d679ff8b3fc5b076e9..8b8b9744585ffbeed04feb82e53f82be32ae54f2 100644 (file)
--- a/plugins/Facebook/facebookhome.php
+++ b/plugins/Facebook/facebookhome.php
@@ -150,7 +150,7 @@ class FacebookhomeAction extends FacebookAction
            // over and over..
             // TRANS: Page title.
             // TRANS: %1$s is a user nickname, %2$s is a page number.
-            return sprintf(_m("%1$s and friends, page %2$d"), $this->user->nickname, $this->page);
+            return sprintf(_m('%1$s and friends, page %2$d'), $this->user->nickname, $this->page);
         } else {
             // TRANS: Page title.
             // TRANS: %s is a user nickname

diff --git a/plugins/Mapstraction/allmap.php b/plugins/Mapstraction/allmap.php
index fa05ccc7ae30db7e6567b93244d57e5bcf21f633..6e2e1d122840d99d58bec97d26055ed197987777 100644 (file)
--- a/plugins/Mapstraction/allmap.php
+++ b/plugins/Mapstraction/allmap.php
@@ -77,7 +77,7 @@ class AllmapAction extends MapAction
             // @todo CHECKME: does this even happen? May not be needed.
             // TRANS: Page title.
             // TRANS: %1$s is a user nickname, %2$d is a page number.
-            return sprintf(_m("%1$s friends map, page %2$d"),
+            return sprintf(_m('%1$s friends map, page %2$d'),
                            $base,
                            $this->page);
         }

diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index dcf1b36078d8f490d83d11b5e4c429df1b0a5d5d..3cd29aff71fbcc08b38cfee803c7ff5be909a91b 100644 (file)
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -655,7 +655,7 @@ class OStatusPlugin extends Plugin
             $act->title = _m("Join");
             // 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."),
+            $act->content = sprintf(_m('%1$s has joined group %2$s.'),
                                     $member->getBestName(),
                                     $oprofile->getBestName());
 
@@ -707,7 +707,7 @@ class OStatusPlugin extends Plugin
             $act->title = _m("Leave");
             // 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."),
+            $act->content = sprintf(_m('%1$s has left group %2$s.'),
                                     $member->getBestName(),
                                     $oprofile->getBestName());