Merge branch '0.9.x'

[quix0rs-gnu-social.git] / actions / groupmembers.php

diff --git a/actions/groupmembers.php b/actions/groupmembers.php
index 6d0701239ffd26a56318b3fbc2353e837fbc6da8..038d1db68a4af6f7fc46378be06385d704635c44 100644 (file)
--- a/actions/groupmembers.php
+++ b/actions/groupmembers.php
@@ -97,9 +97,13 @@ class GroupmembersAction extends GroupDesignAction
     function title()
     {
         if ($this->page == 1) {
+            // TRANS: Title of the page showing group members.
+            // TRANS: %s is the name of the group.
             return sprintf(_('%s group members'),
                            $this->group->nickname);
         } else {
+            // TRANS: Title of the page showing group members.
+            // TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
             return sprintf(_('%1$s group members, page %2$d'),
                            $this->group->nickname,
                            $this->page);
@@ -238,9 +242,13 @@ class GroupMemberListItem extends ProfileListItem
 
     function homepageAttributes()
     {
+        $aAttrs = parent::linkAttributes();
+
         if (common_config('nofollow', 'members')) {
             $aAttrs['rel'] = 'nofollow';
         }
+
+        return $aAttrs;
     }
 
     /**
@@ -385,7 +393,14 @@ class GroupBlockForm extends Form
 
     function formActions()
     {
-        $this->out->submit('submit', _('Block'), 'submit', null, _('Block this user'));
+        $this->out->submit(
+            'submit',
+            // TRANS: Button text for the form that will block a user from a group.
+            _m('BUTTON','Block'),
+            'submit',
+            null,
+            // TRANS: Submit button title.
+            _m('TOOLTIP',_('Block this user'));
     }
 }
 
@@ -512,6 +527,13 @@ class MakeAdminForm extends Form
 
     function formActions()
     {
-        $this->out->submit('submit', _('Make Admin'), 'submit', null, _('Make this user an admin'));
+        $this->out->submit(
+          'submit',
+          // TRANS: Button text for the form that will make a user administrator.
+          _m('BUTTON','Make Admin'),
+          'submit',
+          null,
+          // TRANS: Submit button title.
+          _m('TOOLTIP','Make this user an admin'));
     }
 }