diff options
| author | Brion Vibber <brion@pobox.com> | 2010-10-04 15:22:02 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-10-04 15:22:02 -0700 |
| commit | f58008ebaff81cd8066c21b4a389de2fc9383259 (patch) | |
| tree | b9b16004f403e9b2f8a4d8b856449d71ad003173 /plugins/OStatus | |
| parent | de185a14057e52d6acd306a643eb8f38cd83973e (diff) | |
| parent | c6e8fbebefe7182b9584501d55bc0b32ce7b53a1 (diff) | |
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'plugins/OStatus')
| -rw-r--r-- | plugins/OStatus/OStatusPlugin.php | 4 | ||||
| -rw-r--r-- | plugins/OStatus/actions/pushcallback.php | 1 |
2 files changed, 3 insertions, 2 deletions
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. |