* Fixed unclosed <p> tag

[lhc/web/wiklou.git] / includes / DateFormatter.php

diff --git a/includes/DateFormatter.php b/includes/DateFormatter.php
index e2d4c12..f5cad86 100755 (executable)
--- a/includes/DateFormatter.php
+++ b/includes/DateFormatter.php
@@ -3,37 +3,27 @@
  * Contain things
  * @todo document
  * @package MediaWiki
+ * @subpackage Parser
  */
 
 /** */
 define('DF_ALL', -1);
-/** */
 define('DF_NONE', 0);
-/** */
 define('DF_MDY', 1);
-/** */
 define('DF_DMY', 2);
-/** */
 define('DF_YMD', 3);
-/** */
 define('DF_ISO1', 4);
-/** */
 define('DF_LASTPREF', 4);
-
-/** */
 define('DF_ISO2', 5);
-/** */
 define('DF_YDM', 6);
-/** */
 define('DF_DM', 7);
-/** */
 define('DF_MD', 8);
-/** */
 define('DF_LAST', 8);
 
 /**
  * @todo preferences, OutputPage
  * @package MediaWiki
+ * @subpackage Parser
  */
 class DateFormatter
 {
@@ -47,11 +37,14 @@ class DateFormatter
         * @todo document
         */
        function DateFormatter() {
-               global $wgMonthNamesEn, $wgInputEncoding;
+               global $wgContLang, $wgInputEncoding;
                
                $this->monthNames = $this->getMonthRegex();
                for ( $i=1; $i<=12; $i++ ) {
-                       $this->xMonths[strtolower( $wgMonthNamesEn[$i-1] )] = $i;
+                       $this->xMonths[strtolower( $wgContLang->getMonthName( $i ) )] = $i;
+               }
+               for ( $i=1; $i<=12; $i++ ) {
+                       $this->xMonths[strtolower( $wgContLang->getMonthAbbreviation( $i ) )] = $i;
                }
                
                # Attempt at UTF-8 support, untested at the moment
@@ -108,11 +101,28 @@ class DateFormatter
                $this->rules[DF_NONE][DF_ISO2]  = DF_ISO1;
        }
        
+       /**
+        * @static
+        */
+       function &getInstance() {
+               global $wgDBname, $wgMemc;
+               static $dateFormatter = false;
+               if ( !$dateFormatter ) {
+                       $dateFormatter = $wgMemc->get( "$wgDBname:dateformatter" );
+                       if ( !$dateFormatter ) {
+                               $dateFormatter = new DateFormatter;
+                               $wgMemc->set( "$wgDBname:dateformatter", $dateFormatter, 3600 );
+                       }
+               }
+               return $dateFormatter;
+       }       
+       
        /**
         * @param $preference
         * @param $text
         */
        function reformat( $preference, $text ) {
+               if ($preference == 'ISO 8601') $preference = 4; # The ISO 8601 option used to be 4
                for ( $i=1; $i<=DF_LAST; $i++ ) {
                        $this->mSource = $i;
                        if ( @$this->rules[$preference][$i] ) {
@@ -137,7 +147,6 @@ class DateFormatter
         * @param $matches
         */
        function replace( $matches ) {
-               global $wgMonthNamesEn;
                # Extract information from $matches
                $bits = array();
                $key = $this->keys[$this->mSource];
@@ -157,14 +166,14 @@ class DateFormatter
                        $char = $format{$p};
                        switch ( $char ) {
                                case 'd': # ISO day of month
-                                       if ( is_null($bits['d']) ) {
+                                       if ( !isset($bits['d']) ) {
                                                $text .= sprintf( '%02d', $bits['j'] );
                                        } else {
                                                $text .= $bits['d'];
                                        }
                                        break;
                                case 'm': # ISO month
-                                       if ( is_null($bits['m']) ) {
+                                       if ( !isset($bits['m']) ) {
                                                $m = $this->makeIsoMonth( $bits['F'] );
                                                if ( !$m || $m == '00' ) {
                                                        $fail = true;
@@ -176,33 +185,34 @@ class DateFormatter
                                        }
                                        break;
                                case 'y': # ISO year
-                                       if ( is_null( $bits['y'] ) ) {
+                                       if ( !isset( $bits['y'] ) ) {
                                                $text .= $this->makeIsoYear( $bits['Y'] );
                                        } else {
                                                $text .= $bits['y'];
                                        }
                                        break;
                                case 'j': # ordinary day of month
-                                       if ( is_null($bits['j']) ) {
+                                       if ( !isset($bits['j']) ) {
                                                $text .= IntVal( $bits['d'] );
                                        } else {
                                                $text .= $bits['j'];
                                        }
                                        break;
                                case 'F': # long month
-                                       if ( is_null( $bits['F'] ) ) {
+                                       if ( !isset( $bits['F'] ) ) {
                                                $m = IntVal($bits['m']);
                                                if ( $m > 12 || $m < 1 ) {
                                                        $fail = true;
                                                } else {
-                                                       $text .= $wgMonthNamesEn[$m-1];
+                                                       global $wgContLang;
+                                                       $text .= $wgContLang->getMonthName( $m );
                                                }
                                        } else {
                                                $text .= ucfirst( $bits['F'] );
                                        }
                                        break;
                                case 'Y': # ordinary (optional BC) year
-                                       if ( is_null( $bits['Y'] ) ) {
+                                       if ( !isset( $bits['Y'] ) ) {
                                                $text .= $this->makeNormalYear( $bits['y'] );
                                        } else {
                                                $text .= $bits['Y'];
@@ -222,8 +232,13 @@ class DateFormatter
         * @todo document
         */
        function getMonthRegex() {
-               global $wgMonthNamesEn;
-               return implode( '|', $wgMonthNamesEn );
+               global $wgContLang;
+               $names = array();
+               for( $i = 1; $i <= 12; $i++ ) {
+                       $names[] = $wgContLang->getMonthName( $i );
+                       $names[] = $wgContLang->getMonthAbbreviation( $i );
+               }
+               return implode( '|', $names );
        }
 
        /**
@@ -259,7 +274,7 @@ class DateFormatter
         */
        function makeNormalYear( $iso ) {
                if ( $iso{0} == '-' ) {
-                       $text = (IntVal( substr( $iso, 1 ) ) - 1) . ' BC';
+                       $text = (IntVal( substr( $iso, 1 ) ) + 1) . ' BC';
                } else {
                        $text = IntVal( $iso );
                }
@@ -271,7 +286,8 @@ class DateFormatter
  * @todo document
  */
 function wfMainDateReplace( $matches ) {
-       global $wgDateFormatter;
-       return $wgDateFormatter->replace( $matches );
+       $df =& DateFormatter::getInstance();
+       return $df->replace( $matches );
 }
+
 ?>