http://www.mediawiki.org/wiki/Special:Code/MediaWiki/69967
Revision: 69967
Author: siebrand
Date: 2010-07-26 20:29:55 +0000 (Mon, 26 Jul 2010)
Log Message:
-----------
Revert r69841, r69882, r69892, r69896, r69910 in phase3/maintenance/language
because rebuildLanguage.php was broken.
This prevented message updates by Raymond from translatewiki.net.
Reported issues:
* Warning: in_array() expects parameter 2 to be array, null given in
maintenance\language\languages.inc on line 173
* Warning: in_array() expects parameter 2 to be array, null given in
maintenance\language\languages.inc on line 175
* Warning: in_array(): Wrong datatype for second argument in
phase3\maintenance\language\languages.inc on line 175
Modified Paths:
--------------
trunk/phase3/maintenance/language/StatOutputs.php
trunk/phase3/maintenance/language/checkLanguage.inc
trunk/phase3/maintenance/language/diffLanguage.php
trunk/phase3/maintenance/language/dumpMessages.php
trunk/phase3/maintenance/language/languages.inc
trunk/phase3/maintenance/language/writeMessagesArray.inc
Modified: trunk/phase3/maintenance/language/StatOutputs.php
===================================================================
--- trunk/phase3/maintenance/language/StatOutputs.php 2010-07-26 20:22:55 UTC
(rev 69966)
+++ trunk/phase3/maintenance/language/StatOutputs.php 2010-07-26 20:29:55 UTC
(rev 69967)
@@ -31,6 +31,7 @@
/** Outputs WikiText */
class wikiStatsOutput extends statsOutput {
function heading() {
+ global $IP;
$version = SpecialVersion::getVersion( 'nodb' );
echo "'''Statistics are based on:''' <code>" . $version .
"</code>\n\n";
echo "'''Note:''' These statistics can be generated by running
<code>php maintenance/language/transstat.php</code>.\n\n";
@@ -66,7 +67,7 @@
$blue = '00';
$color = $red . $green . $blue;
- $percent = parent::formatPercent( $subset, $total, $revert,
$accuracy );
+ $percent = statsOutput::formatPercent( $subset, $total,
$revert, $accuracy );
return 'bgcolor="#' . $color . '"|' . $percent;
}
}
Modified: trunk/phase3/maintenance/language/checkLanguage.inc
===================================================================
--- trunk/phase3/maintenance/language/checkLanguage.inc 2010-07-26 20:22:55 UTC
(rev 69966)
+++ trunk/phase3/maintenance/language/checkLanguage.inc 2010-07-26 20:29:55 UTC
(rev 69967)
@@ -383,7 +383,7 @@
* @return The checks results as wiki text.
*/
function outputWiki() {
- global $wgContLang;
+ global $wgContLang, $IP;
$detailText = '';
$rows[] = '! Language !! Code !! Total !! ' . implode( ' !! ',
array_diff( $this->checks, $this->nonMessageChecks() ) );
foreach ( $this->results as $code => $results ) {
Modified: trunk/phase3/maintenance/language/diffLanguage.php
===================================================================
--- trunk/phase3/maintenance/language/diffLanguage.php 2010-07-26 20:22:55 UTC
(rev 69966)
+++ trunk/phase3/maintenance/language/diffLanguage.php 2010-07-26 20:29:55 UTC
(rev 69967)
@@ -75,6 +75,7 @@
$foo = "wgAllMessages$languageCode";
global $$foo;
+ global $wgSkinNamesEn; // potentially unused global declaration?
// it might already be loaded in LocalSettings.php
if ( !isset( $$foo ) ) {
Modified: trunk/phase3/maintenance/language/dumpMessages.php
===================================================================
--- trunk/phase3/maintenance/language/dumpMessages.php 2010-07-26 20:22:55 UTC
(rev 69966)
+++ trunk/phase3/maintenance/language/dumpMessages.php 2010-07-26 20:29:55 UTC
(rev 69967)
@@ -31,7 +31,6 @@
}
public function execute() {
- global $wgVersion;
$messages = array();
foreach ( array_keys( Language::getMessagesFor( 'en' ) ) as
$key ) {
$messages[$key] = wfMsg( $key );
Modified: trunk/phase3/maintenance/language/languages.inc
===================================================================
--- trunk/phase3/maintenance/language/languages.inc 2010-07-26 20:22:55 UTC
(rev 69966)
+++ trunk/phase3/maintenance/language/languages.inc 2010-07-26 20:29:55 UTC
(rev 69967)
@@ -32,9 +32,6 @@
*/
function __construct( $exif = true ) {
require( dirname(__FILE__) . '/messageTypes.inc' );
-
- global $wgIgnoredMessages, $wgOptionalMessages, $wgEXIFMessages;
-
$this->mIgnoredMessages = $wgIgnoredMessages;
if ( $exif ) {
$this->mOptionalMessages = array_merge(
$wgOptionalMessages );
Modified: trunk/phase3/maintenance/language/writeMessagesArray.inc
===================================================================
--- trunk/phase3/maintenance/language/writeMessagesArray.inc 2010-07-26
20:22:55 UTC (rev 69966)
+++ trunk/phase3/maintenance/language/writeMessagesArray.inc 2010-07-26
20:29:55 UTC (rev 69967)
@@ -80,8 +80,6 @@
# Load messages
$dir = $prefix ? $prefix : dirname( __FILE__ );
- global $wgMessageStructure, $wgBlockComments,
$wgIgnoredMessages, $wgOptionalMessages;
-
require( $dir . '/messages.inc' );
self::$messageStructure = $wgMessageStructure;
self::$blockComments = $wgBlockComments;
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
