X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fsubscriptions.php;h=e4cb123912ce4cf7a38c86ffe7055034322d0a32;hb=7602f605d545e31a7e9c5a0015e6f966219407d0;hp=a814a4f354172dd4d24ec2c3156590f576ecdc01;hpb=6455461c196fcb8e7c0047870d480e4a97986709;p=quix0rs-gnu-social.git

diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index a814a4f354..e4cb123912 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -106,8 +106,6 @@ class SubscriptionsAction extends GalleryAction
                 }
             }
 
-            $subscriptions->free();
-
             $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
                               $this->page, 'subscriptions',
                               array('nickname' => $this->user->nickname));
@@ -134,9 +132,7 @@ class SubscriptionsAction extends GalleryAction
                 // TRANS: and do not change the URL part.
                 $message = _('You\'re not listening to anyone\'s notices right now, try subscribing to people you know. '.
                              'Try [people search](%%action.peoplesearch%%), look for members in groups you\'re interested '.
-                             'in and in our [featured users](%%action.featured%%). '.
-                             'If you\'re a [Twitter user](%%action.twittersettings%%), you can automatically subscribe to '.
-                             'people you already follow there.');
+                             'in and in our [featured users](%%action.featured%%).');
             } else {
                 // TRANS: Subscription list text when looking at the subscriptions for a of a user other
                 // TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
@@ -154,30 +150,19 @@ class SubscriptionsAction extends GalleryAction
         $this->elementEnd('div');
     }
 
-    function showSections()
-    {
-        parent::showSections();
-        $cloud = new SubscriptionsPeopleTagCloudSection($this);
-        $cloud->show();
-
-        $cloud2 = new SubscriptionsPeopleSelfTagCloudSection($this);
-        $cloud2->show();
-    }
-
     /**
      * Link to feeds of subscriptions
      *
      * @return array of Feed objects
      */
-
     function getFeeds()
     {
         return array(new Feed(Feed::ATOM,
                               common_local_url('AtomPubSubscriptionFeed',
                                                array('subscriber' => $this->profile->id)),
+                              // TRANS: Atom feed title. %s is a profile nickname.
                               sprintf(_('Subscription feed for %s (Atom)'),
                                       $this->profile->nickname)));
-
     }
 }
 
@@ -218,7 +203,9 @@ class SubscriptionsListItem extends SubscriptionListItem
             return;
         }
 
-        if (!common_config('xmpp', 'enabled') && !common_config('sms', 'enabled')) {
+        $transports = array();
+        Event::handle('GetImTransports', array(&$transports));
+        if (!$transports && !common_config('sms', 'enabled')) {
             return;
         }
 
@@ -228,7 +215,7 @@ class SubscriptionsListItem extends SubscriptionListItem
                                           'action' => common_local_url('subedit')));
         $this->out->hidden('token', common_session_token());
         $this->out->hidden('profile', $this->profile->id);
-        if (common_config('xmpp', 'enabled')) {
+        if ($transports) {
             $attrs = array('name' => 'jabber',
                            'type' => 'checkbox',
                            'class' => 'checkbox',
@@ -238,8 +225,8 @@ class SubscriptionsListItem extends SubscriptionListItem
             }
 
             $this->out->element('input', $attrs);
-            // TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-            $this->out->element('label', array('for' => 'jabber-'.$this->profile->id), _('Jabber'));
+            // TRANS: Checkbox label for enabling IM messages for a profile in a subscriptions list.
+            $this->out->element('label', array('for' => 'jabber-'.$this->profile->id), _m('LABEL','IM'));
         } else {
             $this->out->hidden('jabber', $sub->jabber);
         }
@@ -263,5 +250,4 @@ class SubscriptionsListItem extends SubscriptionListItem
         $this->out->elementEnd('form');
         return;
     }
-
 }