From 8f416baead93a48e5799e44b8bd2e2c4859f4e04 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Fri, 14 Sep 2007 13:18:58 +0200 Subject: auf Version 1.11 aktualisiert; Login-Bug behoben --- maintenance/language/checkLanguage.inc | 99 ++++++++++++++++++++-------------- 1 file changed, 58 insertions(+), 41 deletions(-) (limited to 'maintenance/language/checkLanguage.inc') diff --git a/maintenance/language/checkLanguage.inc b/maintenance/language/checkLanguage.inc index e859e39c..468db550 100644 --- a/maintenance/language/checkLanguage.inc +++ b/maintenance/language/checkLanguage.inc @@ -2,91 +2,108 @@ /** * Check a language. * - * @todo Stop with globals. - * @param $code The language code. + * @param $languages The languages object. + * @param $code The language code (default content language of the wiki running the script on). + * @param: $links Show wiki links to messages (default false)? + * @param: $wikiLanguage Language of the wiki to show the output in, if showing links (default en). + * @param: $checks Checks to do (default all except for duplicates and plural). * @return Number of errors found. */ -function checkLanguage( $wgLanguages, $code ) { - global $wgRequiredMessagesNumber, $wgDisplayLevel, $wgLinks, $wgWikiLanguage, $wgChecks; - +function checkLanguage( $languages, $code = null, $displayLevel = 2, $links = false, $wikiLanguage = 'en', $checks = null ) { # Get messages - $messages = $wgLanguages->getMessages( $code ); + $messages = $languages->getMessages( $code ); $messagesNumber = count( $messages['translated'] ); - # Skip the checks if specified - if ( $wgDisplayLevel == 0 ) { + # Skip the checks if told so + if ( $displayLevel == 0 ) { return; } - // Initialize counts - $untranslatedMessagesNumber = $duplicateMessagesNumber = $obsoleteMessagesNumber - = $messagesWithoutVariablesNumber = $messagesWithoutPluralNumber = $emptyMessagesNumber - = $messagesWithWhitespaceNumber = $nonXHTMLMessagesNumber = $messagesWithWrongCharsNumber - = 0; + # Initialize counts + $problems = 0; + + # Set default language code and checks + if ( !$code ) { + global $wgContLang; + $code = $wgContLang->getCode(); + } + if ( !$checks ) { + $checks = array( 'untranslated', 'obsolete', 'variables', 'empty', 'whitespace', 'xhtml', 'chars' ); + } # Untranslated messages - if ( in_array( 'untranslated', $wgChecks ) ) { - $untranslatedMessages = $wgLanguages->getUntranslatedMessages( $code ); + if ( in_array( 'untranslated', $checks ) ) { + $generalMessages = $languages->getGeneralMessages(); + $requiredMessagesNumber = count( $generalMessages['required'] ); + $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 $requiredMessagesNumber are not translated to $code, but exist in en:", $displayLevel, $links, $wikiLanguage ); + $problems += $untranslatedMessagesNumber; } # Duplicate messages - if ( in_array( 'duplicate', $wgChecks ) ) { - $duplicateMessages = $wgLanguages->getDuplicateMessages( $code ); + if ( in_array( 'duplicate', $checks ) ) { + $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:", $displayLevel, $links, $wikiLanguage ); + $problems += $duplicateMessagesNumber; } # Obsolete messages - if ( in_array( 'obsolete', $wgChecks ) ) { + if ( in_array( 'obsolete', $checks ) ) { $obsoleteMessages = $messages['obsolete']; $obsoleteMessagesNumber = count( $obsoleteMessages ); - $wgLanguages->outputMessagesList( $obsoleteMessages, $code, "\n$obsoleteMessagesNumber messages of $messagesNumber are 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:", $displayLevel, $links, $wikiLanguage ); + $problems += $obsoleteMessagesNumber; } # Messages without variables - if ( in_array( 'variables', $wgChecks ) ) { - $messagesWithoutVariables = $wgLanguages->getMessagesWithoutVariables( $code ); + if ( in_array( 'variables', $checks ) ) { + $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:", $displayLevel, $links, $wikiLanguage ); + $problems += $messagesWithoutVariablesNumber; } # Messages without plural - if ( in_array( 'plural', $wgChecks ) ) { - $messagesWithoutPlural = $wgLanguages->getMessagesWithoutPlural( $code ); + if ( in_array( 'plural', $checks ) ) { + $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:", $displayLevel, $links, $wikiLanguage ); + $problems += $messagesWithoutPluralNumber; } # Empty messages - if ( in_array( 'empty', $wgChecks ) ) { - $emptyMessages = $wgLanguages->getEmptyMessages( $code ); + if ( in_array( 'empty', $checks ) ) { + $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 -:", $displayLevel, $links, $wikiLanguage ); + $problems += $emptyMessagesNumber; } # Messages with whitespace - if ( in_array( 'whitespace', $wgChecks ) ) { - $messagesWithWhitespace = $wgLanguages->getMessagesWithWhitespace( $code ); + if ( in_array( 'whitespace', $checks ) ) { + $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:", $displayLevel, $links, $wikiLanguage ); + $problems += $messagesWithWhitespaceNumber; } # Non-XHTML messages - if ( in_array( 'xhtml', $wgChecks ) ) { - $nonXHTMLMessages = $wgLanguages->getNonXHTMLMessages( $code ); + if ( in_array( 'xhtml', $checks ) ) { + $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:", $displayLevel, $links, $wikiLanguage ); + $problems += $nonXHTMLMessagesNumber; } # Messages with wrong characters - if ( in_array( 'chars', $wgChecks ) ) { - $messagesWithWrongChars = $wgLanguages->getMessagesWithWrongChars( $code ); + if ( in_array( 'chars', $checks ) ) { + $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:", $displayLevel, $links, $wikiLanguage ); + $problems += $messagesWithWrongCharsNumber; } - return ($untranslatedMessagesNumber + $duplicateMessagesNumber + $obsoleteMessagesNumber + $messagesWithoutVariablesNumber + $messagesWithoutPluralNumber + $emptyMessagesNumber + $messagesWithWhitespaceNumber + $nonXHTMLMessagesNumber + $messagesWithWrongCharsNumber); + return $problems; } -?> -- cgit v1.2.3-54-g00ecf