X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fsubscribers.php;h=ad522a4bae63372b0632f302ec794a329ba88735;hb=7cf12f093ed48849ec901038b4cfd44595343c06;hp=6dda7312d67bf7eafb408375f30c6641435951e5;hpb=727ea5a5163249eb40fa0c4b2c63054fc997473b;p=quix0rs-gnu-social.git

diff --git a/actions/subscribers.php b/actions/subscribers.php
index 6dda7312d6..ad522a4bae 100644
--- a/actions/subscribers.php
+++ b/actions/subscribers.php
@@ -41,14 +41,17 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class SubscribersAction extends GalleryAction
 {
     function title()
     {
         if ($this->page == 1) {
+            // TRANS: Header for list of subscribers for a user (first page).
+            // TRANS: %s is the user's nickname.
             return sprintf(_('%s subscribers'), $this->user->nickname);
         } else {
+            // TRANS: Header for list of subscribers for a user (not first page).
+            // TRANS: %1$s is the user's nickname, $2$d is the page number.
             return sprintf(_('%1$s subscribers, page %2$d'),
                            $this->user->nickname,
                            $this->page);
@@ -60,10 +63,14 @@ class SubscribersAction extends GalleryAction
         $user = common_current_user();
         if ($user && ($user->id == $this->profile->id)) {
             $this->element('p', null,
+                           // TRANS: Page notice for page with an overview of all subscribers
+                           // TRANS: of the logged in user's own profile.
                            _('These are the people who listen to '.
                              'your notices.'));
         } else {
             $this->element('p', null,
+                           // TRANS: Page notice for page with an overview of all subscribers of a user other
+                           // TRANS: than the logged in user. %s is the user nickname.
                            sprintf(_('These are the people who '.
                                      'listen to %s\'s notices.'),
                                    $this->profile->nickname));
@@ -93,8 +100,6 @@ class SubscribersAction extends GalleryAction
             }
         }
 
-        $subscribers->free();
-
         $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
                           $this->page, 'subscribers',
                           array('nickname' => $this->user->nickname));
@@ -105,12 +110,20 @@ class SubscribersAction extends GalleryAction
         if (common_logged_in()) {
             $current_user = common_current_user();
             if ($this->user->id === $current_user->id) {
-                $message = _('You have no subscribers. Try subscribing to people you know and they might return the favor');
+                // TRANS: Subscriber list text when the logged in user has no subscribers.
+                $message = _('You have no subscribers. Try subscribing to people you know and they might return the favor.');
             } else {
+                // TRANS: Subscriber list text when looking at the subscribers for a of a user other
+                // TRANS: than the logged in user that has no subscribers. %s is the user nickname.
                 $message = sprintf(_('%s has no subscribers. Want to be the first?'), $this->user->nickname);
             }
         }
         else {
+            // TRANS: Subscriber list text when looking at the subscribers for a of a user that has none
+            // TRANS: as an anonymous user. %s is the user nickname.
+            // TRANS: This message contains a Markdown URL. The link description is between
+            // TRANS: square brackets, and the link between parentheses. Do not separate "]("
+            // TRANS: and do not change the URL part.
             $message = sprintf(_('%s has no subscribers. Why not [register an account](%%%%action.register%%%%) and be the first?'), $this->user->nickname);
         }
 
@@ -157,9 +170,13 @@ class SubscribersListItem extends SubscriptionListItem
         $user = common_current_user();
 
         if (!empty($user) && $this->owner->id == $user->id) {
-            $bf = new BlockForm($this->out, $this->profile,
-                                array('action' => 'subscribers',
-                                      'nickname' => $this->owner->nickname));
+            $returnto = array('action' => 'subscribers',
+                              'nickname' => $this->owner->nickname);
+            $page = $this->out->arg('page');
+            if ($page) {
+                $returnto['param-page'] = $page;
+            }
+            $bf = new BlockForm($this->out, $this->profile, $returnto);
             $bf->show();
         }
     }
@@ -177,8 +194,12 @@ class SubscribersListItem extends SubscriptionListItem
 
     function homepageAttributes()
     {
+        $aAttrs = parent::linkAttributes();
+
         if (common_config('nofollow', 'subscribers')) {
             $aAttrs['rel'] = 'nofollow';
         }
+
+        return $aAttrs;
     }
 }