From f2baa43923c0c0176959147449022b050c581314 Mon Sep 17 00:00:00 2001 From: Antoine Musso Date: Tue, 11 Jan 2005 01:30:13 +0000 Subject: [PATCH] Implement #1206 Patch by M7 "computerville (at) gmail (tod) com" FORPORT from 1_4 --- includes/MagicWord.php | 7 ++++++- includes/Parser.php | 4 ++++ languages/Language.php | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/includes/MagicWord.php b/includes/MagicWord.php index 1ca7a87671..fbb1f0e7c9 100644 --- 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 a96db1c374..0e0661e26c 100644 --- 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 7e86945e91..7192d9a164 100644 --- 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' ), ); #------------------------------------------------------------------- -- 2.20.1