X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Ffeed.php;h=e04c69be6c8e7edd31037d60538333a1de0df23f;hb=dd61ae8fbeee64c85f8186672292335592be1ff5;hp=e9fb6fdff3e392620291763044858a603627d834;hpb=5d09b6b3f0595540c66b703ae085f0af904fe30f;p=quix0rs-gnu-social.git

diff --git a/lib/feed.php b/lib/feed.php
index e9fb6fdff3..e04c69be6c 100644
--- a/lib/feed.php
+++ b/lib/feed.php
@@ -43,13 +43,13 @@ 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 Feed
 {
     const RSS1 = 1;
     const RSS2 = 2;
     const ATOM = 3;
     const FOAF = 4;
+    const JSON = 5; // Activity Streams
 
     var $type = null;
     var $url = null;
@@ -73,6 +73,8 @@ class Feed
             return 'application/atom+xml';
          case Feed::FOAF:
             return 'application/rdf+xml';
+         case Feed::JSON:
+            return 'application/stream+json';
          default:
             return null;
         }
@@ -82,13 +84,20 @@ class Feed
     {
         switch ($this->type) {
          case Feed::RSS1:
+            // TRANS: Feed type name.
             return _('RSS 1.0');
          case Feed::RSS2:
+            // TRANS: Feed type name.
             return _('RSS 2.0');
          case Feed::ATOM:
+            // TRANS: Feed type name.
             return _('Atom');
          case Feed::FOAF:
+            // TRANS: Feed type name. FOAF stands for Friend of a Friend.
             return _('FOAF');
+         case Feed::JSON:
+            // TRANS: Feed type name. See http://activitystrea.ms/
+            return _('Activity Streams');
          default:
             return null;
         }
@@ -100,6 +109,7 @@ class Feed
          case Feed::RSS1:
          case Feed::RSS2:
          case Feed::ATOM:
+         case Feed::JSON:
             return 'alternate';
          case Feed::FOAF:
             return 'meta';