From: Rotem Liss <rotem@users.mediawiki.org>
Date: Fri, 4 Aug 2006 20:58:19 +0000 (+0000)
Subject: In the language scripts:
X-Git-Tag: 1.31.0-rc.0~56076
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=83f7f25ea2db9c639ea68263eae2a94e44c429fd;p=lhc%2Fweb%2Fwiklou.git

In the language scripts:
* Using Language::getMessagesFor instead of creating new language objects.
* Allowing a parameter which specifies the language code to check instead of the default one, in checktrans.php, duplicatetrans.php and unusedMessages.php.
checktrans.php still does not work; duplicatetrans.php still works improperly.
---

diff --git a/maintenance/alltrans.php b/maintenance/alltrans.php
index ad41f03208..9dd8756fb2 100644
--- a/maintenance/alltrans.php
+++ b/maintenance/alltrans.php
@@ -8,8 +8,8 @@
 
 require_once( 'commandLine.inc' );
 
-$wgEnglishLang = Language::factory( 'en' );
-foreach( array_keys( $wgEnglishLang->getAllMessages() ) as $key ) {
+$wgEnglishMessages = array_keys( Language::getMessagesFor( 'en' ) );
+foreach( $wgEnglishMessages as $key ) {
 	echo "$key\n";
 }
 
diff --git a/maintenance/checktrans.php b/maintenance/checktrans.php
index 42a7b845ba..5c0969fa09 100644
--- a/maintenance/checktrans.php
+++ b/maintenance/checktrans.php
@@ -3,32 +3,37 @@
  * @package MediaWiki
  * @subpackage Maintenance
  * Check to see if all messages have been translated into the selected language.
- * To run this script, you must have a working installation, and it checks the
- * selected language of that installation.
+ * To run this script, you must have a working installation, and you can specify
+ * a language, or the script will check the installation language.
  */
 
 /** */
 require_once('commandLine.inc');
 
-die( "This script currently *does not work*, please wait for fix.\n" );
+#die( "This script currently *does not work*, please wait for fix.\n" );
 
-if ( $wgLang->getCode() == 'en' ) {
+if ( isset( $args[0] ) ) {
+	$code = $args[0];
+} else {
+	$code = $wgLang->getCode();
+}
+
+if ( $code == 'en' ) {
 	print "Current selected language is English. Cannot check translations.\n";
 	exit();
 }
 
 $count = $total = 0;
-$wgEnglishLang = Language::factory( 'en' );
-$wgEnglishMessages = $wgEnglishLang->getAllMessages();
-$wgLocalMessages = $wgLang->getAllMessages();
+$wgEnglishMessages = Language::getMessagesFor( 'en' );
+$wgLocalMessages = Language::getMessagesFor( $code );
 
-foreach ( $wgEnglishMessages as $code => $msg ) {
+foreach ( $wgEnglishMessages as $key => $msg ) {
 	++$total;
-	if ( !isset( $wgLocalMessages[$code] ) ) {
-		print "'{$code}' => \"$msg\",\n";
+	if ( !isset( $wgLocalMessages[$key] ) ) {
+		print "'{$key}' => \"$msg\",\n";
 		++$count;
 	}
 }
 
-print "{$count} messages of {$total} not translated.\n";
+print "{$count} messages of {$total} are not translated in the language {$code}.\n";
 ?>
diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index 93edce12e7..68afea8792 100644
--- a/maintenance/commandLine.inc
+++ b/maintenance/commandLine.inc
@@ -157,7 +157,7 @@ if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
 	if ( isset( $options['conf'] ) ) {
 		$settingsFile = $options['conf'];
 	} else {
-		$settingsFile = "$IP/LocalSettings.php";
+		$settingsFile = "../he/LocalSettings.php";
 	}
 
 	if ( ! is_readable( $settingsFile ) ) {
diff --git a/maintenance/dumpMessages.php b/maintenance/dumpMessages.php
index b31b092a3b..f273c71e03 100644
--- a/maintenance/dumpMessages.php
+++ b/maintenance/dumpMessages.php
@@ -9,8 +9,8 @@
 require_once( "commandLine.inc" );
 $wgMessageCache->disableTransform();
 $messages = array();
-$wgEnglishLang = Language::factory( 'en' );
-foreach ( $wgEnglishLang->getAllMessages() as $key => $englishValue )
+$wgEnglishMessages = array_keys( Language::getMessagesFor( 'en' ) );
+foreach ( $wgEnglishMessages as $key )
 {
 	$messages[$key] = wfMsg( $key );
 }
diff --git a/maintenance/duplicatetrans.php b/maintenance/duplicatetrans.php
index 89779e8586..8f82fd6a31 100644
--- a/maintenance/duplicatetrans.php
+++ b/maintenance/duplicatetrans.php
@@ -11,23 +11,28 @@ require_once('commandLine.inc');
 
 echo "Note: the script also lists the messages which are not defined in this language file, please wait for the bugfix.\n\n";
 
-if ( $wgLang->getCode() == 'en' ) {
+if ( isset( $args[0] ) ) {
+	$code = $args[0];
+} else {
+	$code = $wgLang->getCode();
+}
+
+if ( $code == 'en' ) {
 	print "Current selected language is English. Cannot check translations.\n";
 	exit();
 }
 
 $count = $total = 0;
-$wgEnglishLang = Language::factory( 'en' );
-$wgEnglishMessages = $wgEnglishLang->getAllMessages();
-$wgLocalMessages = $wgLang->getAllMessages();
+$wgEnglishMessages = Language::getMessagesFor( 'en' );
+$wgLocalMessages = Language::getMessagesFor( $code );
 
-foreach ( $wgEnglishMessages as $code => $msg ) {
+foreach ( $wgEnglishMessages as $key => $msg ) {
 	++$total;
-	if ( $wgLocalMessages[$code] == $wgEnglishMessages[$code] ) {
-		echo "* $code\n";
+	if ( $wgLocalMessages[$key] == $wgEnglishMessages[$key] ) {
+		echo "* $key\n";
 		++$count;
 	}
 }
 
-echo "{$count} messages of {$total} are duplicates\n";
+echo "{$count} messages of {$total} are duplicates in the language {$code}\n";
 ?>
diff --git a/maintenance/unusedMessages.php b/maintenance/unusedMessages.php
index 351f854165..67170bc829 100644
--- a/maintenance/unusedMessages.php
+++ b/maintenance/unusedMessages.php
@@ -8,23 +8,28 @@
 
 require_once('commandLine.inc');
 
-if ( $wgLang->getCode() == 'en' ) {
+if ( isset( $args[0] ) ) {
+	$code = $args[0];
+} else {
+	$code = $wgLang->getCode();
+}
+
+if ( $code == 'en' ) {
 	print "Current selected language is English. Cannot check translations.\n";
 	exit();
 }
 
 $count = $total = 0;
-$wgEnglishLang = Language::factory( 'en' );
-$wgEnglishMessages = $wgEnglishLang->getAllMessages();
-$wgLocalMessages = $wgLang->getAllMessages();
+$wgEnglishMessages = Language::getMessagesFor( 'en' );
+$wgLocalMessages = Language::getMessagesFor( $code );
 
-foreach ( $wgLocalMessages as $code => $msg ) {
+foreach ( $wgLocalMessages as $key => $msg ) {
 	++$total;
-	if ( !isset( $wgEnglishMessages[$code] ) ) {
-		print "* $code\n";
+	if ( !isset( $wgEnglishMessages[$key] ) ) {
+		print "* $key\n";
 		++$count;
 	}
 }
 
-print "{$count} messages of {$total} are unused\n";
+print "{$count} messages of {$total} are unused in the language {$code}\n";
 ?>