From 370e83bb0dfd0c70de268c93bf07ad5ee0897192 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Fri, 15 Aug 2008 01:29:47 +0200
Subject: Update auf 1.13.0

---
 maintenance/language/writeMessagesArray.inc | 50 ++++++++++++++++-------------
 1 file changed, 28 insertions(+), 22 deletions(-)

(limited to 'maintenance/language/writeMessagesArray.inc')

diff --git a/maintenance/language/writeMessagesArray.inc b/maintenance/language/writeMessagesArray.inc
index 2324785e..3a279cb6 100644
--- a/maintenance/language/writeMessagesArray.inc
+++ b/maintenance/language/writeMessagesArray.inc
@@ -2,14 +2,17 @@
 /**
  * Write a messages array as a PHP text.
  *
- * @addtogroup Maintenance
+ * @file
+ * @ingroup MaintenanceLanguage
  */
 
+/**
+ * @ingroup MaintenanceLanguage
+ */
 class MessageWriter {
 	static $optionalComment = 'only translate this message to other languages if you have to change it';
-	static $ignoredComment = "don't translate or duplicate this message to other languages";
+	static $ignoredComment = "do not translate or duplicate this message to other languages";
 
-	static $loaded = false;
 	static $messageStructure;
 	static $blockComments;
 	static $messageComments;
@@ -24,9 +27,9 @@ class MessageWriter {
 	 * @param $write Write to the messages file?
 	 * @param $listUnknown List the unknown messages?
 	 */
-	public static function writeMessagesToFile( $messages, $code, $write, $listUnknown ) {
+	public static function writeMessagesToFile( $messages, $code, $write, $listUnknown, $removeUnknown ) {
 		# Rewrite the messages array
-		$messages = self::writeMessagesArray( $messages, $code == 'en' );
+		$messages = self::writeMessagesArray( $messages, $code == 'en', false, $removeUnknown );
 		$messagesText = $messages[0];
 		$sortedMessages = $messages[1];
 
@@ -48,13 +51,16 @@ class MessageWriter {
 				}
 			}
 			if( $listUnknown && isset( $sortedMessages['unknown'] ) && !empty( $sortedMessages['unknown'] ) ) {
-				echo "\nThere are " . count( $sortedMessages['unknown'] ) . " unknown messages, please check them:\n";
+				if ( $removeUnknown )
+					echo "\nThe following " . count( $sortedMessages['unknown'] ) . " unknown messages have been removed:\n";
+				else
+					echo "\nThere are " . count( $sortedMessages['unknown'] ) . " unknown messages, please check them:\n";
 				foreach( $sortedMessages['unknown'] as $key => $value ) {
 					echo "* " . $key . "\n";
 				}
 			}
 		} else {
-			echo "Generated messages for language $code. There seems to be no messages array in the file.\n";
+			echo "Generated messages for language $code. There seem to be no messages array in the file.\n";
 		}
 	}
 
@@ -66,20 +72,19 @@ class MessageWriter {
 	 *
 	 * @return Array of the PHP text and the sorted messages array.
 	 */
-	public static function writeMessagesArray( $messages, $ignoredComments = false ) {
+	public static function writeMessagesArray( $messages, $ignoredComments = false, $prefix = false, $removeUnknown = false ) {
 		# Load messages
-		if( !self::$loaded ) {
-			require( dirname( __FILE__ ) . '/messages.inc' );
-			self::$messageStructure = $wgMessageStructure;
-			self::$blockComments = $wgBlockComments;
-			self::$messageComments = $wgMessageComments;
+		$dir = $prefix ? $prefix : dirname( __FILE__ );
 
-			require( dirname( __FILE__ ) . '/messageTypes.inc' );
-			self::$ignoredMessages = $wgIgnoredMessages;
-			self::$optionalMessages = $wgOptionalMessages;
+		require( $dir . '/messages.inc' );
+		self::$messageStructure = $wgMessageStructure;
+		self::$blockComments = $wgBlockComments;
+		self::$messageComments = $wgMessageComments;
+
+		require( $dir . '/messageTypes.inc' );
+		self::$ignoredMessages = $wgIgnoredMessages;
+		self::$optionalMessages = $wgOptionalMessages;
 
-			self::$loaded = true;
-		}
 
 		# Sort messages to blocks
 		$sortedMessages['unknown'] = $messages;
@@ -115,12 +120,13 @@ class MessageWriter {
 		}
 
 		# Write the unknown messages, alphabetically sorted.
-		# Of course, we don't have any comments for them, because the are unknown.
-		ksort( $sortedMessages['unknown'] );
-		$messagesText .= self::writeMessagesBlock( 'Unknown messages', $sortedMessages['unknown'] );
+		# Of course, we don't have any comments for them, because they are unknown.
+		if ( !$removeUnknown ) {
+			ksort( $sortedMessages['unknown'] );
+			$messagesText .= self::writeMessagesBlock( 'Unknown messages', $sortedMessages['unknown'] );
+		}
 		$messagesText .= ");
 ";
-
 		return array( $messagesText, $sortedMessages );
 	}
 
-- 
cgit v1.2.2