Implement #1206

Patch by M7 "computerville (at) gmail (tod) com"
FORPORT from 1_4

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 1ca7a87..fbb1f0e 100644 (file)
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -47,6 +47,9 @@ define('MAG_TOC', 33);
 define('MAG_GRAMMAR', 34);
 define('MAG_NOTITLECONVERT', 35);
 
+define('MAG_CURRENTWEEK', 37);
+define('MAG_CURRENTDOW', 38);
+
 $wgVariableIDs = array(
        MAG_CURRENTMONTH,
        MAG_CURRENTMONTHNAME,
@@ -60,7 +63,9 @@ $wgVariableIDs = array(
        MAG_SERVER,
        MAG_PAGENAME,
        MAG_PAGENAMEE,
-       MAG_NAMESPACE
+       MAG_NAMESPACE,
+       MAG_CURRENTWEEK,
+       MAG_CURRENTDOW
 );
 
 /**

diff --git a/includes/Parser.php b/includes/Parser.php
index a96db1c..0e0661e 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -1769,6 +1769,10 @@ class Parser
                                return $varCache[$index] = $wgContLang->formatNum( date( 'Y' ) );
                        case MAG_CURRENTTIME:
                                return $varCache[$index] = $wgContLang->time( wfTimestampNow(), false );
+                       case MAG_CURRENTWEEK:
+                               return $varCache[$index] = $wgContLang->formatNum( date('W') );
+                       case MAG_CURRENTDOW:
+                               return $varCache[$index] = $wgContLang->formatNum( date('w') );
                        case MAG_NUMBEROFARTICLES:
                                return $varCache[$index] = $wgContLang->formatNum( wfNumberOfArticles() );
                        case MAG_SITENAME:

diff --git a/languages/Language.php b/languages/Language.php
index 7e86945..7192d9a 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -237,6 +237,8 @@ $wgLanguageNamesEn =& $wgLanguageNames;
        MAG_SERVER               => array( 0,    'SERVER'                 ),
        MAG_GRAMMAR              => array( 0,    'GRAMMAR:'               ),
        MAG_NOTITLECONVERT       => array( 0,    '__NOTITLECONVERT__', '__NOTC__'),
+       MAG_CURRENTWEEK          => array( 1,    'CURRENTWEEK'            ),
+       MAG_CURRENTDOW           => array( 1,    'CURRENTDOW'             ),
 );
 
 #-------------------------------------------------------------------