Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

4 files changed, 5 insertions, 4 deletions

diff --git a/plugins/Facebook/facebookhome.php b/plugins/Facebook/facebookhome.php
index 6090f988c..8b8b97445 100644
--- 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 fa05ccc7a..6e2e1d122 100644
--- 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 dcf1b3607..3cd29aff7 100644
--- 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());
 
diff --git a/plugins/OStatus/actions/pushcallback.php b/plugins/OStatus/actions/pushcallback.php
index 701a39c16..6eec1ad16 100644
--- a/plugins/OStatus/actions/pushcallback.php
+++ b/plugins/OStatus/actions/pushcallback.php
@@ -81,6 +81,7 @@ class PushCallbackAction extends Action
         $challenge = $this->arg('hub_challenge');
         $lease_seconds = $this->arg('hub_lease_seconds');
         $verify_token = $this->arg('hub_verify_token');
+        common_log(LOG_INFO, __METHOD__ . ": sub verification mode: $mode topic: $topic challenge: $challenge lease_seconds: $lease_seconds verify_token: $verify_token");
 
         if ($mode != 'subscribe' && $mode != 'unsubscribe') {
             // TRANS: Client exception. %s is an invalid value for hub.mode.