X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=actions%2Fconversation.php;h=8d11df37bc52ac637cbf91fc46b06efa0ec5f6c3;hb=2306f7a7f4f746215d432af4351452ed4aa423f0;hp=c8755ba6ef3df29e9c9821b28b56ac6595f66653;hpb=3dbbefd5ad63679162659ce736e9e556f2efff21;p=quix0rs-gnu-social.git

diff --git a/actions/conversation.php b/actions/conversation.php
index c8755ba6ef..8d11df37bc 100644
--- a/actions/conversation.php
+++ b/actions/conversation.php
@@ -5,13 +5,13 @@
  * PHP version 5
  *
  * @category Action
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2009, Control Yourself, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -27,7 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -40,12 +40,11 @@ require_once INSTALLDIR.'/lib/noticelist.php';
  * Conversation tree in the browser
  *
  * @category Action
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
-
 class ConversationAction extends Action
 {
     var $id   = null;
@@ -58,7 +57,6 @@ class ConversationAction extends Action
      *
      * @return boolean false if id not passed in
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -81,7 +79,6 @@ class ConversationAction extends Action
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
@@ -93,10 +90,10 @@ class ConversationAction extends Action
      *
      * @return string page title
      */
-
     function title()
     {
-        return _("Conversation");
+        // TRANS: Title for page with a conversion (multiple notices in context).
+        return _('Conversation');
     }
 
     /**
@@ -107,7 +104,6 @@ class ConversationAction extends Action
      *
      * @return void
      */
-
     function showContent()
     {
         $notices = Notice::conversationStream($this->id, null, null);
@@ -129,12 +125,11 @@ class ConversationAction extends Action
  * The widget class for displaying a hierarchical list of notices.
  *
  * @category Widget
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
-
 class ConversationTree extends NoticeList
 {
     var $tree  = null;
@@ -145,12 +140,12 @@ class ConversationTree extends NoticeList
      *
      * @return void
      */
-
     function show()
     {
         $cnt = $this->_buildTree();
 
         $this->out->elementStart('div', array('id' =>'notices_primary'));
+        // TRANS: Header on conversation page. Hidden by default (h2).
         $this->out->element('h2', null, _('Notices'));
         $this->out->elementStart('ol', array('class' => 'notices xoxo'));
 
@@ -167,6 +162,8 @@ class ConversationTree extends NoticeList
 
     function _buildTree()
     {
+        $cnt = 0;
+
         $this->tree  = array();
         $this->table = array();
 
@@ -198,7 +195,6 @@ class ConversationTree extends NoticeList
      *
      * @return void
      */
-
     function showNoticePlus($id)
     {
         $notice = $this->table[$id];
@@ -235,7 +231,6 @@ class ConversationTree extends NoticeList
      *
      * @return NoticeListItem a list item to show
      */
-
     function newListItem($notice)
     {
         return new ConversationTreeItem($notice, $this->out);
@@ -248,12 +243,11 @@ class ConversationTree extends NoticeList
  * Special class of NoticeListItem for use inside conversation trees.
  *
  * @category Widget
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
-
 class ConversationTreeItem extends NoticeListItem
 {
     /**
@@ -264,7 +258,6 @@ class ConversationTreeItem extends NoticeListItem
      *
      * @return void
      */
-
     function showStart()
     {
         return;
@@ -278,7 +271,6 @@ class ConversationTreeItem extends NoticeListItem
      *
      * @return void
      */
-
     function showEnd()
     {
         return;
@@ -291,7 +283,6 @@ class ConversationTreeItem extends NoticeListItem
      *
      * @return void
      */
-
     function showContext()
     {
         return;