From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Thu, 29 Jun 2006 13:37:06 +0000 (+0000)
Subject: * Added formatnum magic word
X-Git-Tag: 1.31.0-rc.0~56527
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22config_fonctions%22%2C%20%22image_process=%24process%22%29%20.%20%22?a=commitdiff_plain;h=165955b292d8f0ef0776e6c488054c335e58b75d;p=lhc%2Fweb%2Fwiklou.git

* Added formatnum magic word
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f9baa05b86..d4ff52c512 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -601,6 +601,7 @@ Some default configuration options have changed:
 * (bug 6201) Treat spaces as underscores in parameters to {{ns:}}
 * (bug 6006) Allow hiding the password change fields using an authentication plugin
 * (bug 6489) Use appropriate link colour on Special:Shortpages
+* Added formatnum magic word
 
 == Compatibility ==
 
diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 121d1304d6..fdf8cdd60a 100644
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -96,6 +96,7 @@ $magicWords = array(
 	'MAG_PAGESINNAMESPACE',
 	'MAG_NOGALLERY',
 	'MAG_NUMBEROFADMINS',
+	'MAG_FORMATNUM',
 );
 if ( ! defined( 'MEDIAWIKI_INSTALL' ) )
 	wfRunHooks( 'MagicWordMagicWords', array( &$magicWords ) );
diff --git a/includes/Parser.php b/includes/Parser.php
index c6098d559d..2fde2df9da 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -2753,6 +2753,15 @@ class Parser
 		}
 
 		$lang = $this->mOptions->getInterfaceMessage() ? $wgLang : $wgContLang;
+		if ( !$found && $argc == 1 ) {
+			$mwGrammar =& MagicWord::get( MAG_FORMATNUM );
+			if ( $mwGrammar->matchStartAndRemove( $part1 ) ) {
+				$text = $linestart . $lang->formatNum( $args[0] );
+				$found = true;
+			}
+		}
+
+
 		# GRAMMAR
 		if ( !$found && $argc == 1 ) {
 			$mwGrammar =& MagicWord::get( MAG_GRAMMAR );
diff --git a/languages/Language.php b/languages/Language.php
index c528066861..cb13ae368c 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -290,10 +290,12 @@ $wgLanguageNamesEn =& $wgLanguageNames;
 	MAG_URLENCODE            => array( 0,    'URLENCODE:'             ),
 	MAG_CURRENTTIMESTAMP     => array( 1,    'CURRENTTIMESTAMP'       ),
 	MAG_DIRECTIONMARK        => array( 1,    'DIRECTIONMARK', 'DIRMARK' ),
-	MAG_LANGUAGE			 => array( 0,	 '#LANGUAGE:' ),
-	MAG_CONTENTLANGUAGE		 => array( 1,	 'CONTENTLANGUAGE', 'CONTENTLANG' ),
-	MAG_PAGESINNAMESPACE	 => array( 1,	 'PAGESINNAMESPACE:', 'PAGESINNS:' ),
-	MAG_NUMBEROFADMINS		 => array( 1,	 'NUMBEROFADMINS' ),
+	MAG_LANGUAGE             => array( 0,    '#LANGUAGE:' ),
+	MAG_CONTENTLANGUAGE      => array( 1,    'CONTENTLANGUAGE', 'CONTENTLANG' ),
+	MAG_PAGESINNAMESPACE     => array( 1,    'PAGESINNAMESPACE:', 'PAGESINNS:' ),
+	MAG_NUMBEROFADMINS       => array( 1,    'NUMBEROFADMINS' ),
+	MAG_FORMATNUM            => array( 0,    'FORMATNUM' ),
+
 );
 
 if (!$wgCachedMessageArrays) {
@@ -334,8 +336,8 @@ class Language {
 	 * @return array
 	 */
 	function getDefaultUserOptions() {
-		global $wgDefaultUserOptionsEn ;
-		return $wgDefaultUserOptionsEn ;
+		global $wgDefaultUserOptionsEn;
+		return $wgDefaultUserOptionsEn;
 	}
 
 	/**
@@ -343,8 +345,8 @@ class Language {
 	 * @return array
 	 */
 	function getBookstoreList() {
-		global $wgBookstoreListEn ;
-		return $wgBookstoreListEn ;
+		global $wgBookstoreListEn;
+		return $wgBookstoreListEn;
 	}
 
 	/**