Merge commit 'refs/merge-requests/164' of git://gitorious.org/statusnet/mainline...

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

diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 45dbaf3b3dc030b5448c2e216f1eddd335de491b..b4575565b902fe1a9da9d1417b15561d1858023b 100644 (file)
--- 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));
@@ -154,14 +152,19 @@ class SubscriptionsAction extends GalleryAction
         $this->elementEnd('div');
     }
 
-    function showSections()
+    /**
+     * Link to feeds of subscriptions
+     *
+     * @return array of Feed objects
+     */
+    function getFeeds()
     {
-        parent::showSections();
-        $cloud = new SubscriptionsPeopleTagCloudSection($this);
-        $cloud->show();
-
-        $cloud2 = new SubscriptionsPeopleSelfTagCloudSection($this);
-        $cloud2->show();
+        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)));
     }
 }
 
@@ -224,8 +227,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), _('IM'));
+            // 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);
         }