http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70385
Revision: 70385
Author: platonides
Date: 2010-08-03 14:16:10 +0000 (Tue, 03 Aug 2010)
Log Message:
-----------
Change from global to parameter.
Modified Paths:
--------------
trunk/phase3/maintenance/language/rebuildLanguage.php
Modified: trunk/phase3/maintenance/language/rebuildLanguage.php
===================================================================
--- trunk/phase3/maintenance/language/rebuildLanguage.php 2010-08-03
13:25:10 UTC (rev 70384)
+++ trunk/phase3/maintenance/language/rebuildLanguage.php 2010-08-03
14:16:10 UTC (rev 70385)
@@ -21,9 +21,8 @@
* @param $removeDupes Remove the duplicated messages?
* @param $dupeMsgSource The source file intended to remove from the array.
*/
-function rebuildLanguage( $code, $write, $listUnknown, $removeUnknown,
$removeDupes, $dupeMsgSource ) {
- global $wgLanguages;
- $messages = $wgLanguages->getMessages( $code );
+function rebuildLanguage( $languages, $code, $write, $listUnknown,
$removeUnknown, $removeDupes, $dupeMsgSource ) {
+ $messages = $languages->getMessages( $code );
$messages = $messages['all'];
if ( $removeDupes ) {
$messages = removeDupes( $messages, $dupeMsgSource );
@@ -96,13 +95,13 @@
$wgRemoveDuplicateMessages = isset( $options['remove-duplicates'] );
# Get language objects
-$wgLanguages = new languages();
+$languages = new languages();
# Write all the language
if ( $wgCode == 'all' ) {
- foreach ( $wgLanguages->getLanguages() as $language ) {
- rebuildLanguage( $language, $wgWriteToFile,
$wgListUnknownMessages, $wgRemoveUnknownMessages, $wgRemoveDuplicateMessages,
$wgDupeMessageSource );
+ foreach ( $languages->getLanguages() as $languageCode ) {
+ rebuildLanguage( $languages, $languageCode, $wgWriteToFile,
$wgListUnknownMessages, $wgRemoveUnknownMessages, $wgRemoveDuplicateMessages,
$wgDupeMessageSource );
}
} else {
- rebuildLanguage( $wgCode, $wgWriteToFile, $wgListUnknownMessages,
$wgRemoveUnknownMessages, $wgRemoveDuplicateMessages, $wgDupeMessageSource );
+ rebuildLanguage( $languages, $wgCode, $wgWriteToFile,
$wgListUnknownMessages, $wgRemoveUnknownMessages, $wgRemoveDuplicateMessages,
$wgDupeMessageSource );
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
