From 2ce9ae004d1f15ea4181f9fa686a73817ee45474 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 3 Mar 2010 15:29:51 -0500 Subject: Added event hooks for before and after user groups content --- actions/usergroups.php | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) (limited to 'actions/usergroups.php') diff --git a/actions/usergroups.php b/actions/usergroups.php index 97faabae6..29bda0a76 100644 --- a/actions/usergroups.php +++ b/actions/usergroups.php @@ -130,22 +130,26 @@ class UsergroupsAction extends OwnerDesignAction _('Search for more groups')); $this->elementEnd('p'); - $offset = ($this->page-1) * GROUPS_PER_PAGE; - $limit = GROUPS_PER_PAGE + 1; + if (Event::handle('StartShowUserGroupsContent', array($this))) { + $offset = ($this->page-1) * GROUPS_PER_PAGE; + $limit = GROUPS_PER_PAGE + 1; + + $groups = $this->user->getGroups($offset, $limit); + + if ($groups) { + $gl = new GroupList($groups, $this->user, $this); + $cnt = $gl->show(); + if (0 == $cnt) { + $this->showEmptyListMessage(); + } + } - $groups = $this->user->getGroups($offset, $limit); + $this->pagination($this->page > 1, $cnt > GROUPS_PER_PAGE, + $this->page, 'usergroups', + array('nickname' => $this->user->nickname)); - if ($groups) { - $gl = new GroupList($groups, $this->user, $this); - $cnt = $gl->show(); - if (0 == $cnt) { - $this->showEmptyListMessage(); - } + Event::handle('EndShowUserGroupsContent', array($this)); } - - $this->pagination($this->page > 1, $cnt > GROUPS_PER_PAGE, - $this->page, 'usergroups', - array('nickname' => $this->user->nickname)); } function showEmptyListMessage() -- cgit v1.2.3-54-g00ecf From 518832da28456259bf9fc0030d26e1a090e30f67 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 10 Apr 2010 01:48:16 +0200 Subject: Document messages for which clarification was requested. --- actions/allrss.php | 2 ++ actions/apigrouplistall.php | 1 + actions/apitimelinefriends.php | 1 + actions/apitimelinehome.php | 1 + actions/confirmaddress.php | 2 ++ actions/designadminpanel.php | 3 +++ actions/grouprss.php | 2 ++ actions/usergroups.php | 2 ++ actions/userrss.php | 2 ++ lib/atomgroupnoticefeed.php | 1 + lib/atomusernoticefeed.php | 1 + 11 files changed, 18 insertions(+) (limited to 'actions/usergroups.php') diff --git a/actions/allrss.php b/actions/allrss.php index 01e737ad7..7df0b1ef7 100644 --- a/actions/allrss.php +++ b/actions/allrss.php @@ -112,10 +112,12 @@ class AllrssAction extends Rss10Action $c = array('url' => common_local_url('allrss', array('nickname' => $user->nickname)), + // TRANS: Message is used as link title. %s is a user nickname. 'title' => sprintf(_('%s and friends'), $user->nickname), 'link' => common_local_url('all', array('nickname' => $user->nickname)), + // TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. 'description' => sprintf(_('Updates from %1$s and friends on %2$s!'), $user->nickname, common_config('site', 'name'))); return $c; diff --git a/actions/apigrouplistall.php b/actions/apigrouplistall.php index f7677970f..bd05fa3ea 100644 --- a/actions/apigrouplistall.php +++ b/actions/apigrouplistall.php @@ -87,6 +87,7 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction parent::handle($args); $sitename = common_config('site', 'name'); + // TRANS: Message is used as a title. %s is a site name. $title = sprintf(_("%s groups"), $sitename); $taguribase = TagURI::base(); $id = "tag:$taguribase:Groups"; diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php index ac350ab1b..7f80f252e 100644 --- a/actions/apitimelinefriends.php +++ b/actions/apitimelinefriends.php @@ -116,6 +116,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction $id = "tag:$taguribase:FriendsTimeline:" . $this->user->id; $subtitle = sprintf( + // TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. _('Updates from %1$s and friends on %2$s!'), $this->user->nickname, $sitename diff --git a/actions/apitimelinehome.php b/actions/apitimelinehome.php index 1618c9923..43a13dcda 100644 --- a/actions/apitimelinehome.php +++ b/actions/apitimelinehome.php @@ -117,6 +117,7 @@ class ApiTimelineHomeAction extends ApiBareAuthAction $id = "tag:$taguribase:HomeTimeline:" . $this->user->id; $subtitle = sprintf( + // TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. _('Updates from %1$s and friends on %2$s!'), $this->user->nickname, $sitename ); diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php index dc17499f5..8bf8c8c4d 100644 --- a/actions/confirmaddress.php +++ b/actions/confirmaddress.php @@ -87,10 +87,12 @@ class ConfirmaddressAction extends Action } $type = $confirm->address_type; if (!in_array($type, array('email', 'jabber', 'sms'))) { + // TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'. $this->serverError(sprintf(_('Unrecognized address type %s.'), $type)); return; } if ($cur->$type == $confirm->address) { + // TRANS: Client error for an already confirmed email/jabbel/sms address. $this->clientError(_('That address has already been confirmed.')); return; } diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php index 41d917e3c..8c08581b5 100644 --- a/actions/designadminpanel.php +++ b/actions/designadminpanel.php @@ -59,6 +59,7 @@ class DesignadminpanelAction extends AdminPanelAction function title() { + // TRANS: Message used as title for design settings for the site. return _('Design'); } @@ -454,6 +455,7 @@ class DesignAdminPanelForm extends AdminForm $this->out->element('label', array('for' => 'design_background-image_on', 'class' => 'radio'), + // TRANS: Used as radio button label to add a background image. _('On')); $attrs = array('name' => 'design_background-image_onoff', @@ -470,6 +472,7 @@ class DesignAdminPanelForm extends AdminForm $this->out->element('label', array('for' => 'design_background-image_off', 'class' => 'radio'), + // TRANS: Used as radio button label to not add a background image. _('Off')); $this->out->element('p', 'form_guide', _('Turn background image on or off.')); $this->unli(); diff --git a/actions/grouprss.php b/actions/grouprss.php index 490f6f945..98fdea38d 100644 --- a/actions/grouprss.php +++ b/actions/grouprss.php @@ -135,8 +135,10 @@ class groupRssAction extends Rss10Action $c = array('url' => common_local_url('grouprss', array('nickname' => $group->nickname)), + // TRANS: Message is used as link title. %s is a user nickname. 'title' => sprintf(_('%s timeline'), $group->nickname), 'link' => common_local_url('showgroup', array('nickname' => $group->nickname)), + // TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. 'description' => sprintf(_('Updates from members of %1$s on %2$s!'), $group->nickname, common_config('site', 'name'))); return $c; diff --git a/actions/usergroups.php b/actions/usergroups.php index 29bda0a76..6606e76cd 100644 --- a/actions/usergroups.php +++ b/actions/usergroups.php @@ -59,8 +59,10 @@ class UsergroupsAction extends OwnerDesignAction function title() { if ($this->page == 1) { + // TRANS: Message is used as a page title. %s is a nick name. return sprintf(_('%s groups'), $this->user->nickname); } else { + // TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number. return sprintf(_('%1$s groups, page %2$d'), $this->user->nickname, $this->page); diff --git a/actions/userrss.php b/actions/userrss.php index c6103b2f8..b7078fcaf 100644 --- a/actions/userrss.php +++ b/actions/userrss.php @@ -90,8 +90,10 @@ class UserrssAction extends Rss10Action $c = array('url' => common_local_url('userrss', array('nickname' => $user->nickname)), + // TRANS: Message is used as link title. %s is a user nickname. 'title' => sprintf(_('%s timeline'), $user->nickname), 'link' => $profile->profileurl, + // TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. 'description' => sprintf(_('Updates from %1$s on %2$s!'), $user->nickname, common_config('site', 'name'))); return $c; diff --git a/lib/atomgroupnoticefeed.php b/lib/atomgroupnoticefeed.php index 08c1c707c..08c28a48b 100644 --- a/lib/atomgroupnoticefeed.php +++ b/lib/atomgroupnoticefeed.php @@ -63,6 +63,7 @@ class AtomGroupNoticeFeed extends AtomNoticeFeed $sitename = common_config('site', 'name'); $subtitle = sprintf( + // TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. _('Updates from %1$s on %2$s!'), $group->nickname, $sitename diff --git a/lib/atomusernoticefeed.php b/lib/atomusernoticefeed.php index 428cc2de2..a534cbee6 100644 --- a/lib/atomusernoticefeed.php +++ b/lib/atomusernoticefeed.php @@ -69,6 +69,7 @@ class AtomUserNoticeFeed extends AtomNoticeFeed $sitename = common_config('site', 'name'); $subtitle = sprintf( + // TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name. _('Updates from %1$s on %2$s!'), $user->nickname, $sitename ); -- cgit v1.2.3-54-g00ecf