diff options
Diffstat (limited to 'actions')
-rw-r--r-- | actions/apigrouplist.php | 9 | ||||
-rw-r--r-- | actions/imsettings.php | 2 | ||||
-rw-r--r-- | actions/shownotice.php | 2 | ||||
-rw-r--r-- | actions/tag.php | 13 |
4 files changed, 17 insertions, 9 deletions
diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php index dd2a68c66..3ea2c30cb 100644 --- a/actions/apigrouplist.php +++ b/actions/apigrouplist.php @@ -93,6 +93,7 @@ class ApiGroupListAction extends ApiBareAuthAction parent::handle($args); $sitename = common_config('site', 'name'); + // TRANS: %s is a user name $title = sprintf(_("%s's groups"), $this->user->nickname); $taguribase = TagURI::base(); $id = "tag:$taguribase:Groups"; @@ -100,10 +101,12 @@ class ApiGroupListAction extends ApiBareAuthAction 'usergroups', array('nickname' => $this->user->nickname) ); + $subtitle = sprintf( - _("Groups %1\$s is a member of on %2\$s."), - $this->user->nickname, - $sitename + // TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s + _("%1\$s groups %2\$s is a member of."), + $sitename, + $this->user->nickname ); switch($this->format) { diff --git a/actions/imsettings.php b/actions/imsettings.php index af4915843..c3360fb12 100644 --- a/actions/imsettings.php +++ b/actions/imsettings.php @@ -292,7 +292,7 @@ class ImsettingsAction extends ConnectSettingsAction $this->showForm(_('Cannot normalize that Jabber ID')); return; } - if (!jabber_valid_base_jid($jabber)) { + if (!jabber_valid_base_jid($jabber, common_config('email', 'domain_check'))) { $this->showForm(_('Not a valid Jabber ID')); return; } else if ($user->jabber == $jabber) { diff --git a/actions/shownotice.php b/actions/shownotice.php index a23027f7c..ca6b60d1f 100644 --- a/actions/shownotice.php +++ b/actions/shownotice.php @@ -167,7 +167,7 @@ class ShownoticeAction extends OwnerDesignAction function title() { if (!empty($this->profile->fullname)) { - $base = $this->profile->fullname . ' (' . $this->profile->nickname . ') '; + $base = $this->profile->fullname . ' (' . $this->profile->nickname . ')'; } else { $base = $this->profile->nickname; } diff --git a/actions/tag.php b/actions/tag.php index ee9617b66..512dac63a 100644 --- a/actions/tag.php +++ b/actions/tag.php @@ -102,12 +102,17 @@ class TagAction extends Action function showContent() { - $nl = new NoticeList($this->notice, $this); + if(Event::handle('StartTagShowContent', array($this))) { + + $nl = new NoticeList($this->notice, $this); - $cnt = $nl->show(); + $cnt = $nl->show(); - $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE, - $this->page, 'tag', array('tag' => $this->tag)); + $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE, + $this->page, 'tag', array('tag' => $this->tag)); + + Event::handle('EndTagShowContent', array($this)); + } } function isReadOnly($args) |