Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

[quix0rs-gnu-social.git] / lib / profileaction.php

diff --git a/lib/profileaction.php b/lib/profileaction.php
index ca008739de500649c44d20442e6e99fbc877146f..59682d5505e76bf84d967f5cdf2a7c1cec88ce28 100644 (file)
--- a/lib/profileaction.php
+++ b/lib/profileaction.php
@@ -126,7 +126,9 @@ class ProfileAction extends OwnerDesignAction
         if (Event::handle('StartShowSubscriptionsMiniList', array($this))) {
             $this->elementStart('h2');
             // TRANS: H2 text for user subscription statistics.
-            $this->statsSectionLink('subscriptions', _('Subscriptions'));
+            $this->statsSectionLink('subscriptions', _('Following'));
+            $this->text(' ');
+            $this->text($this->profile->subscriptionCount());
             $this->elementEnd('h2');
 
             $cnt = 0;
@@ -140,13 +142,6 @@ class ProfileAction extends OwnerDesignAction
                 }
             }
 
-            if ($cnt > PROFILES_PER_MINILIST) {
-                $this->elementStart('p');
-                // TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-                $this->statsSectionLink('subscriptions', _('All subscriptions'), 'more');
-                $this->elementEnd('p');
-            }
-
             Event::handle('EndShowSubscriptionsMiniList', array($this));
         }
         $this->elementEnd('div');
@@ -163,7 +158,9 @@ class ProfileAction extends OwnerDesignAction
 
             $this->elementStart('h2');
             // TRANS: H2 text for user subscriber statistics.
-            $this->statsSectionLink('subscribers', _('Subscribers'));
+            $this->statsSectionLink('subscribers', _('Followers'));
+            $this->text(' ');
+            $this->text($this->profile->subscriberCount());
             $this->elementEnd('h2');
 
             $cnt = 0;
@@ -177,13 +174,6 @@ class ProfileAction extends OwnerDesignAction
                 }
             }
 
-            if ($cnt > PROFILES_PER_MINILIST) {
-                $this->elementStart('p');
-                // TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-                $this->statsSectionLink('subscribers', _('All subscribers'), 'more');
-                $this->elementEnd('p');
-            }
-
             Event::handle('EndShowSubscribersMiniList', array($this));
         }
 
@@ -243,27 +233,6 @@ class ProfileAction extends OwnerDesignAction
                 'label' => _('Member since'),
                 'value' => date('j M Y', strtotime($profile->created))
             ),
-            array(
-                'id' => 'subscriptions',
-                // TRANS: Label for user statistics.
-                'label' => _('Subscriptions'),
-                'link' => common_local_url('subscriptions', $actionParams),
-                'value' => $profile->subscriptionCount(),
-            ),
-            array(
-                'id' => 'subscribers',
-                // TRANS: Label for user statistics.
-                'label' => _('Subscribers'),
-                'link' => common_local_url('subscribers', $actionParams),
-                'value' => $profile->subscriberCount(),
-            ),
-            array(
-                'id' => 'groups',
-                // TRANS: Label for user statistics.
-                'label' => _('Groups'),
-                'link' => common_local_url('usergroups', $actionParams),
-                'value' => $profile->getGroups()->N,
-            ),
             array(
                 'id' => 'notices',
                 // TRANS: Label for user statistics.
@@ -312,6 +281,8 @@ class ProfileAction extends OwnerDesignAction
             $this->elementStart('h2');
             // TRANS: H2 text for user group membership statistics.
             $this->statsSectionLink('usergroups', _('Groups'));
+            $this->text(' ');
+            $this->text($this->profile->getGroups()->N);
             $this->elementEnd('h2');
 
             if ($groups) {