From: Rotem Liss <rotem@users.mediawiki.org>
Date: Mon, 27 Aug 2007 16:29:54 +0000 (+0000)
Subject: * Using the appropriate prefix for parameter (wg means global).
X-Git-Tag: 1.31.0-rc.0~51637
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=9ed3a55c09b89930556b2d94f4c71f84aa2f2465;p=lhc%2Fweb%2Fwiklou.git

* Using the appropriate prefix for parameter (wg means global).
* Documenting the parameter.
---

diff --git a/maintenance/language/checkLanguage.inc b/maintenance/language/checkLanguage.inc
index f96b93f1d3..6a9fcb8919 100644
--- a/maintenance/language/checkLanguage.inc
+++ b/maintenance/language/checkLanguage.inc
@@ -3,14 +3,15 @@
  * Check a language.
  *
  * @todo Stop with globals.
+ * @param $languages The languages object.
  * @param $code The language code.
  * @return Number of errors found.
  */
-function checkLanguage( $wgLanguages, $code ) {
+function checkLanguage( $languages, $code ) {
 	global $wgRequiredMessagesNumber, $wgDisplayLevel, $wgLinks, $wgWikiLanguage, $wgChecks;
 
 	# Get messages
-	$messages = $wgLanguages->getMessages( $code );
+	$messages = $languages->getMessages( $code );
 	$messagesNumber = count( $messages['translated'] );
 
 	# Skip the checks if specified
@@ -26,65 +27,65 @@ function checkLanguage( $wgLanguages, $code ) {
 
 	# Untranslated messages
 	if ( in_array( 'untranslated', $wgChecks ) ) {
-		$untranslatedMessages = $wgLanguages->getUntranslatedMessages( $code );
+		$untranslatedMessages = $languages->getUntranslatedMessages( $code );
 		$untranslatedMessagesNumber = count( $untranslatedMessages );
-		$wgLanguages->outputMessagesList( $untranslatedMessages, $code, "\n$untranslatedMessagesNumber messages of $wgRequiredMessagesNumber are not translated to $code, but exist in en:", $wgDisplayLevel, $wgLinks, $wgWikiLanguage );
+		$languages->outputMessagesList( $untranslatedMessages, $code, "\n$untranslatedMessagesNumber messages of $wgRequiredMessagesNumber are not translated to $code, but exist in en:", $wgDisplayLevel, $wgLinks, $wgWikiLanguage );
 	}
 
 	# Duplicate messages
 	if ( in_array( 'duplicate', $wgChecks ) ) {
-		$duplicateMessages = $wgLanguages->getDuplicateMessages( $code );
+		$duplicateMessages = $languages->getDuplicateMessages( $code );
 		$duplicateMessagesNumber = count( $duplicateMessages );
-		$wgLanguages->outputMessagesList( $duplicateMessages, $code, "\n$duplicateMessagesNumber messages of $messagesNumber are translated the same in en and $code:", $wgDisplayLevel, $wgLinks, $wgWikiLanguage );
+		$languages->outputMessagesList( $duplicateMessages, $code, "\n$duplicateMessagesNumber messages of $messagesNumber are translated the same in en and $code:", $wgDisplayLevel, $wgLinks, $wgWikiLanguage );
 	}
 
 	# Obsolete messages
 	if ( in_array( 'obsolete', $wgChecks ) ) {
 		$obsoleteMessages = $messages['obsolete'];
 		$obsoleteMessagesNumber = count( $obsoleteMessages );
-		$wgLanguages->outputMessagesList( $obsoleteMessages, $code, "\n$obsoleteMessagesNumber messages of $messagesNumber do not exist in en (or are in the ignored list), but still exist in $code:", $wgDisplayLevel, $wgLinks, $wgWikiLanguage );
+		$languages->outputMessagesList( $obsoleteMessages, $code, "\n$obsoleteMessagesNumber messages of $messagesNumber do not exist in en (or are in the ignored list), but still exist in $code:", $wgDisplayLevel, $wgLinks, $wgWikiLanguage );
 	}
 
 	# Messages without variables
 	if ( in_array( 'variables', $wgChecks ) ) {
-		$messagesWithoutVariables = $wgLanguages->getMessagesWithoutVariables( $code );
+		$messagesWithoutVariables = $languages->getMessagesWithoutVariables( $code );
 		$messagesWithoutVariablesNumber = count( $messagesWithoutVariables );
-		$wgLanguages->outputMessagesList( $messagesWithoutVariables, $code, "\n$messagesWithoutVariablesNumber messages of $messagesNumber in $code don't use some variables while en uses them:", $wgDisplayLevel, $wgLinks, $wgWikiLanguage );
+		$languages->outputMessagesList( $messagesWithoutVariables, $code, "\n$messagesWithoutVariablesNumber messages of $messagesNumber in $code don't use some variables while en uses them:", $wgDisplayLevel, $wgLinks, $wgWikiLanguage );
 	}
 
 	# Messages without plural
 	if ( in_array( 'plural', $wgChecks ) ) {
-		$messagesWithoutPlural = $wgLanguages->getMessagesWithoutPlural( $code );
+		$messagesWithoutPlural = $languages->getMessagesWithoutPlural( $code );
 		$messagesWithoutPluralNumber = count( $messagesWithoutPlural );
-		$wgLanguages->outputMessagesList( $messagesWithoutPlural, $code, "\n$messagesWithoutPluralNumber messages of $messagesNumber in $code don't use {{plural}} while en uses it:", $wgDisplayLevel, $wgLinks, $wgWikiLanguage );
+		$languages->outputMessagesList( $messagesWithoutPlural, $code, "\n$messagesWithoutPluralNumber messages of $messagesNumber in $code don't use {{plural}} while en uses it:", $wgDisplayLevel, $wgLinks, $wgWikiLanguage );
 	}
 
 	# Empty messages
 	if ( in_array( 'empty', $wgChecks ) ) {
-		$emptyMessages = $wgLanguages->getEmptyMessages( $code );
+		$emptyMessages = $languages->getEmptyMessages( $code );
 		$emptyMessagesNumber = count( $emptyMessages );
-		$wgLanguages->outputMessagesList( $emptyMessages, $code, "\n$emptyMessagesNumber messages of $messagesNumber in $code are empty or -:", $wgDisplayLevel, $wgLinks, $wgWikiLanguage );
+		$languages->outputMessagesList( $emptyMessages, $code, "\n$emptyMessagesNumber messages of $messagesNumber in $code are empty or -:", $wgDisplayLevel, $wgLinks, $wgWikiLanguage );
 	}
 
 	# Messages with whitespace
 	if ( in_array( 'whitespace', $wgChecks ) ) {
-		$messagesWithWhitespace = $wgLanguages->getMessagesWithWhitespace( $code );
+		$messagesWithWhitespace = $languages->getMessagesWithWhitespace( $code );
 		$messagesWithWhitespaceNumber = count( $messagesWithWhitespace );
-		$wgLanguages->outputMessagesList( $messagesWithWhitespace, $code, "\n$messagesWithWhitespaceNumber messages of $messagesNumber in $code have a trailing whitespace:", $wgDisplayLevel, $wgLinks, $wgWikiLanguage );
+		$languages->outputMessagesList( $messagesWithWhitespace, $code, "\n$messagesWithWhitespaceNumber messages of $messagesNumber in $code have a trailing whitespace:", $wgDisplayLevel, $wgLinks, $wgWikiLanguage );
 	}
 
 	# Non-XHTML messages
 	if ( in_array( 'xhtml', $wgChecks ) ) {
-		$nonXHTMLMessages = $wgLanguages->getNonXHTMLMessages( $code );
+		$nonXHTMLMessages = $languages->getNonXHTMLMessages( $code );
 		$nonXHTMLMessagesNumber = count( $nonXHTMLMessages );
-		$wgLanguages->outputMessagesList( $nonXHTMLMessages, $code, "\n$nonXHTMLMessagesNumber messages of $messagesNumber in $code are not well-formed XHTML:", $wgDisplayLevel, $wgLinks, $wgWikiLanguage );
+		$languages->outputMessagesList( $nonXHTMLMessages, $code, "\n$nonXHTMLMessagesNumber messages of $messagesNumber in $code are not well-formed XHTML:", $wgDisplayLevel, $wgLinks, $wgWikiLanguage );
 	}
 
 	# Messages with wrong characters
 	if ( in_array( 'chars', $wgChecks ) ) {
-		$messagesWithWrongChars = $wgLanguages->getMessagesWithWrongChars( $code );
+		$messagesWithWrongChars = $languages->getMessagesWithWrongChars( $code );
 		$messagesWithWrongCharsNumber = count( $messagesWithWrongChars );
-		$wgLanguages->outputMessagesList( $messagesWithWrongChars, $code, "\n$messagesWithWrongCharsNumber messages of $messagesNumber in $code include hidden chars which should not be used in the messages:", $wgDisplayLevel, $wgLinks, $wgWikiLanguage );
+		$languages->outputMessagesList( $messagesWithWrongChars, $code, "\n$messagesWithWrongCharsNumber messages of $messagesNumber in $code include hidden chars which should not be used in the messages:", $wgDisplayLevel, $wgLinks, $wgWikiLanguage );
 	}
 
 	return ($untranslatedMessagesNumber + $duplicateMessagesNumber + $obsoleteMessagesNumber + $messagesWithoutVariablesNumber + $messagesWithoutPluralNumber + $emptyMessagesNumber + $messagesWithWhitespaceNumber + $nonXHTMLMessagesNumber + $messagesWithWrongCharsNumber);