summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-09-15 07:11:24 -0400
committerEvan Prodromou <evan@status.net>2010-09-15 07:11:24 -0400
commitfac1942dad983eb9f7f455c252c472873f9b2e60 (patch)
tree859d7abfe55738a1e3f08477b8e1fa614471add9
parentd2877f4c3d8d147396e570fd130eb93f16a5b1bb (diff)
better output for group membership as activity
-rw-r--r--classes/Group_member.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/classes/Group_member.php b/classes/Group_member.php
index c6ff24fed..939a9cde7 100644
--- a/classes/Group_member.php
+++ b/classes/Group_member.php
@@ -100,16 +100,16 @@ class Group_member extends Memcached_DataObject
$group->id,
common_date_iso8601($this->created));
- $act->actor = ActivityObject::fromProfile($member);
- $act->verb = ActivityVerb::JOIN;
- $act->object = ActivityObject::fromGroup($group);
+ $act->actor = ActivityObject::fromProfile($member);
+ $act->verb = ActivityVerb::JOIN;
+ $act->objects[] = ActivityObject::fromGroup($group);
$act->time = strtotime($this->created);
- $act->title = _m("Join");
+ $act->title = _("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(_('%1$s has joined group %2$s.'),
$member->getBestName(),
$group->getBestName());