ShowstreamAction fixes so it's not as horrible

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

diff --git a/actions/version.php b/actions/version.php
index 37555652c764f501ef83ca2201b405f0c745a97b..97115d23cd364089fadffe1bd270adcde5c5286a 100644 (file)
--- a/actions/version.php
+++ b/actions/version.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
+ * Copyright (C) 2008-2011, StatusNet, Inc.
  *
  * Show version information for this software and plugins
  *
@@ -21,15 +21,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category Info
- * @package  StatusNet
+ * @package  GNUsocial
  * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
  * @link     http://status.net/
  */
 
-if (!defined('STATUSNET')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Version info page
@@ -39,10 +37,10 @@ if (!defined('STATUSNET')) {
  * complete documentation for admins.
  *
  * @category Info
- * @package  StatusNet
+ * @package  GNUsocial
  * @author   Evan Prodromou <evan@status.net>
  * @author   Craig Andrews <candrews@integralblue.com>
- * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
+ * @copyright 2009-2011 Free Software Foundation, Inc http://www.fsf.org
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
  * @link     http://status.net/
  */
@@ -69,8 +67,8 @@ class VersionAction extends Action
      */
     function title()
     {
-        // TRANS: Title for version page. %s is the StatusNet version.
-        return sprintf(_("StatusNet %s"), STATUSNET_VERSION);
+        // TRANS: Title for version page. %1$s is the engine name, %2$s is the engine version.
+        return sprintf(_('%1$s %2$s'), GNUSOCIAL_ENGINE, GNUSOCIAL_VERSION);
     }
 
     /**
@@ -83,7 +81,7 @@ class VersionAction extends Action
      *
      * @return boolean true
      */
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -102,25 +100,25 @@ class VersionAction extends Action
      *
      * @return void
      */
-    function handle($args)
+    protected function handle()
     {
-        parent::handle($args);
+        parent::handle();
         $this->showPage();
     }
 
 
     /*
-    * Override to add hentry, and content-inner classes
+    * Override to add h-entry, and content-inner classes
     *
     * @return void
     */
     function showContentBlock()
      {
-         $this->elementStart('div', array('id' => 'content', 'class' => 'hentry'));
+         $this->elementStart('div', array('id' => 'content', 'class' => 'h-entry'));
          $this->showPageTitle();
          $this->showPageNoticeBlock();
          $this->elementStart('div', array('id' => 'content_inner',
-                                          'class' => 'entry-content'));
+                                          'class' => 'e-content'));
          // show the actual content (forms, lists, whatever)
          $this->showContent();
          $this->elementEnd('div');
@@ -146,41 +144,42 @@ class VersionAction extends Action
     {
         $this->elementStart('p');
 
-        // TRANS: Content part of StatusNet version page.
-        // TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
+        // TRANS: Content part of engine version page.
+        // TRANS: %1$s is the engine name (GNU social) and %2$s is the GNU social version.
         $this->raw(sprintf(_('This site is powered by %1$s version %2$s, '.
-                             'Copyright 2008-2010 StatusNet, Inc. '.
+                             'Copyright 2008-2013 StatusNet, Inc. '.
                              'and contributors.'),
-                           XMLStringer::estring('a', array('href' => 'http://status.net/'),
+                           XMLStringer::estring('a', array('href' => GNUSOCIAL_ENGINE_URL),
                                                 // TRANS: Engine name.
-                                                _('StatusNet')),
-                           STATUSNET_VERSION));
+                                                GNUSOCIAL_ENGINE),
+                           GNUSOCIAL_VERSION));
         $this->elementEnd('p');
 
-        // TRANS: Header for StatusNet contributors section on the version page.
+        // TRANS: Header for engine software contributors section on the version page.
         $this->element('h2', null, _('Contributors'));
 
+        sort($this->contributors);
         $this->element('p', null, implode(', ', $this->contributors));
 
-        // TRANS: Header for StatusNet license section on the version page.
+        // TRANS: Header for engine software license section on the version page.
         $this->element('h2', null, _('License'));
 
         $this->element('p', null,
-                       // TRANS: Content part of StatusNet version page.
-                       _('StatusNet is free software: you can redistribute it and/or modify '.
+                       // TRANS: Content part of engine software version page. %1s is engine name
+                       sprintf(_('%1$s is free software: you can redistribute it and/or modify '.
                          'it under the terms of the GNU Affero General Public License as published by '.
                          'the Free Software Foundation, either version 3 of the License, or '.
-                         '(at your option) any later version. '));
+                         '(at your option) any later version.'), GNUSOCIAL_ENGINE));
 
         $this->element('p', null,
-                       // TRANS: Content part of StatusNet version page.
+                       // TRANS: Content part of engine software version page.
                        _('This program is distributed in the hope that it will be useful, '.
                          'but WITHOUT ANY WARRANTY; without even the implied warranty of '.
                          'MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the '.
-                         'GNU Affero General Public License for more details. '));
+                         'GNU Affero General Public License for more details.'));
 
         $this->elementStart('p');
-        // TRANS: Content part of StatusNet version page.
+        // TRANS: Content part of engine version page.
         // TRANS: %s is a link to the AGPL license with link description "http://www.gnu.org/licenses/agpl.html".
         $this->raw(sprintf(_('You should have received a copy of the GNU Affero General Public License '.
                              'along with this program.  If not, see %s.'),
@@ -191,7 +190,7 @@ class VersionAction extends Action
         // XXX: Theme information?
 
         if (count($this->pluginVersions)) {
-            // TRANS: Header for StatusNet plugins section on the version page.
+            // TRANS: Header for engine plugins section on the version page.
             $this->element('h2', null, _('Plugins'));
 
             $this->elementStart('table', array('id' => 'plugins_enabled'));
@@ -277,6 +276,8 @@ class VersionAction extends Action
                               'mEDI',
                               'Brett Taylor',
                               'Brigitte Schuster',
-                              'Brion Vibber',
-                              'Siebrand Mazeland');
+                              'Brion Vibber (StatusNet)',
+                              'Siebrand Mazeland',
+                              'Samantha Doherty (StatusNet)',
+                              'Mikael Nordfeldth (FSF)');
 }