http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72164
Revision: 72164
Author: demon
Date: 2010-09-01 21:01:46 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
Fix author list duplication.
Modified Paths:
--------------
trunk/phase3/includes/installer/Installer.i18n.php
trunk/phase3/includes/installer/WebInstallerPage.php
trunk/phase3/includes/specials/SpecialVersion.php
Modified: trunk/phase3/includes/installer/Installer.i18n.php
===================================================================
--- trunk/phase3/includes/installer/Installer.i18n.php 2010-09-01 20:37:56 UTC
(rev 72163)
+++ trunk/phase3/includes/installer/Installer.i18n.php 2010-09-01 21:01:46 UTC
(rev 72164)
@@ -66,7 +66,6 @@
See the GNU General Public License for more details.
You should have received <doclink href=Copying>a copy of the GNU General
Public License</doclink> along with this program; if not, write to the Free
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA. or [http://www.gnu.org/copyleft/gpl.html read it online].",
- 'config-authors' => 'MediaWiki is Copyright ©
2001-2010 by Magnus Manske, Brion Vibber, Lee Daniel Crocker, Tim Starling,
Erik Möller, Gabriel Wicke, Ævar Arnfjörð Bjarmason, Niklas Laxström, Domas
Mituzas, Rob Church, Yuri Astrakhan, Aryeh Gregor, Aaron Schulz, Andrew
Garrett, Raimond Spekking, Alexandre Emsenhuber, Siebrand Mazeland, Chad
Horohoe and others.', // TODO: move this to core strings and use it in
Special:Version, too?
'config-sidebar' => "* [http://www.mediawiki.org
MediaWiki home]
* [http://www.mediawiki.org/wiki/Help:Contents User's Guide]
* [http://www.mediawiki.org/wiki/Manual:Contents Administrator's Guide]
Modified: trunk/phase3/includes/installer/WebInstallerPage.php
===================================================================
--- trunk/phase3/includes/installer/WebInstallerPage.php 2010-09-01
20:37:56 UTC (rev 72163)
+++ trunk/phase3/includes/installer/WebInstallerPage.php 2010-09-01
21:01:46 UTC (rev 72164)
@@ -197,7 +197,8 @@
$this->parent->output->addWikiText( wfMsgNoTrans(
'config-welcome' ) );
$status = $this->parent->doEnvironmentChecks();
if ( $status ) {
- $this->parent->output->addWikiText( wfMsgNoTrans(
'config-copyright', wfMsg( 'config-authors' ) ) );
+ $this->parent->output->addWikiText( wfMsgNoTrans(
'config-copyright',
+ SpecialVersion::getCopyrightAndAuthorList() ) );
$this->startForm();
$this->endForm();
}
Modified: trunk/phase3/includes/specials/SpecialVersion.php
===================================================================
--- trunk/phase3/includes/specials/SpecialVersion.php 2010-09-01 20:37:56 UTC
(rev 72163)
+++ trunk/phase3/includes/specials/SpecialVersion.php 2010-09-01 21:01:46 UTC
(rev 72164)
@@ -89,8 +89,7 @@
// This text is always left-to-right.
$ret .= '<div>';
$ret .= "__NOTOC__
- " . wfMsg( 'version-poweredby-credits', date( 'Y' ),
- $wgLang->listToText( $authorList ) ) . "\n
+ " . self::getCopyrightAndAuthorList() . "\n
" . wfMsg( 'version-license-info' );
$ret .= '</div>';
@@ -98,6 +97,26 @@
}
/**
+ * Get the "Mediawiki is copyright 2001-20xx by lots of cool guys" text
+ *
+ * @return String
+ */
+ public static function getCopyrightAndAuthorList() {
+ global $wgLang;
+
+ $authorList = array( 'Magnus Manske', 'Brion Vibber', 'Lee
Daniel Crocker',
+ 'Tim Starling', 'Erik Möller', 'Gabriel Wicke', 'Ævar
Arnfjörð Bjarmason',
+ 'Niklas Laxström', 'Domas Mituzas', 'Rob Church', 'Yuri
Astrakhan',
+ 'Aryeh Gregor', 'Aaron Schulz', 'Andrew Garrett',
'Raimond Spekking',
+ 'Alexandre Emsenhuber', 'Siebrand Mazeland', 'Chad
Horohoe',
+ wfMsg( 'version-poweredby-others' )
+ );
+
+ return wfMsg( 'version-poweredby-credits', date( 'Y' ),
+ $wgLang->listToText( $authorList ) );
+ }
+
+ /**
* Returns wiki text showing the third party software versions (apache,
php, mysql).
*
* @return string
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
