* Added formatnum magic word

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f9baa05..d4ff52c 100644 (file)
--- 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 121d130..fdf8cdd 100644 (file)
--- 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 c6098d5..2fde2df 100644 (file)
--- 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 c528066..cb13ae3 100644 (file)
--- 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;
        }
 
        /**