Localisation updates German
[lhc/web/wiklou.git] / languages / Language.php
index ae0c796..d9aa5f5 100644 (file)
@@ -1,7 +1,6 @@
 <?php
 /**
- * @package MediaWiki
- * @subpackage Language
+ * @addtogroup Language
  */
 
 if( !defined( 'MEDIAWIKI' ) ) {
@@ -9,24 +8,11 @@ if( !defined( 'MEDIAWIKI' ) ) {
        exit( 1 );
 }
 
-#
-# In general you should not make customizations in these language files
-# directly, but should use the MediaWiki: special namespace to customize
-# user interface messages through the wiki.
-# See http://meta.wikipedia.org/wiki/MediaWiki_namespace
-#
-# NOTE TO TRANSLATORS: Do not copy this whole file when making translations!
-# A lot of common constants and a base class with inheritable methods are
-# defined here, which should not be redefined. See the other LanguageXx.php
-# files for examples.
-#
-
 # Read language names
 global $wgLanguageNames;
-require_once( 'Names.php' );
+require_once( dirname(__FILE__) . '/Names.php' ) ;
 
 global $wgInputEncoding, $wgOutputEncoding;
-global $wgDBname, $wgMemc;
 
 /**
  * These are always UTF-8, they exist only for backwards compatibility
@@ -49,9 +35,10 @@ class FakeConverter {
        function findVariantLink(&$l, &$n) {}
        function getExtraHashOptions() {return '';}
        function getParsedTitle() {return '';}
-       function markNoConversion($text) {return $text;}
+       function markNoConversion($text, $noParse=false) {return $text;}
        function convertCategoryKey( $key ) {return $key; }
-
+       function convertLinkToAllVariants($text){ return array( $this->mLang->getCode() => $text); }
+       function armourMath($text){ return $text; }
 }
 
 #--------------------------------------------------------------------------
@@ -60,20 +47,23 @@ class FakeConverter {
 
 class Language {
        var $mConverter, $mVariants, $mCode, $mLoaded = false;
+       var $mMagicExtensions = array(), $mMagicHookDone = false;
 
        static public $mLocalisationKeys = array( 'fallback', 'namespaceNames',
-               'quickbarSettings', 'skinNames', 'mathNames', 
+               'skinNames', 'mathNames', 
                'bookstoreList', 'magicWords', 'messages', 'rtl', 'digitTransformTable', 
                'separatorTransformTable', 'fallback8bitEncoding', 'linkPrefixExtension',
                'defaultUserOptionOverrides', 'linkTrail', 'namespaceAliases', 
                'dateFormats', 'datePreferences', 'datePreferenceMigrationMap', 
-               'defaultDateFormat', 'extraUserToggles' );
+               'defaultDateFormat', 'extraUserToggles', 'specialPageAliases' );
 
        static public $mMergeableMapKeys = array( 'messages', 'namespaceNames', 'mathNames', 
                'dateFormats', 'defaultUserOptionOverrides', 'magicWords' );
 
        static public $mMergeableListKeys = array( 'extraUserToggles' );
 
+       static public $mMergeableAliasListKeys = array( 'specialPageAliases' );
+
        static public $mLocalisationCache = array();
 
        static public $mWeekdayMsgs = array(
@@ -100,6 +90,29 @@ class Language {
                'sep', 'oct', 'nov', 'dec'
        );
 
+       static public $mIranianCalendarMonthMsgs = array(
+               'iranian-calendar-m1', 'iranian-calendar-m2', 'iranian-calendar-m3',
+               'iranian-calendar-m4', 'iranian-calendar-m5', 'iranian-calendar-m6',
+               'iranian-calendar-m7', 'iranian-calendar-m8', 'iranian-calendar-m9',
+               'iranian-calendar-m10', 'iranian-calendar-m11', 'iranian-calendar-m12'
+       );
+
+       static public $mHebrewCalendarMonthMsgs = array(
+               'hebrew-calendar-m1', 'hebrew-calendar-m2', 'hebrew-calendar-m3',
+               'hebrew-calendar-m4', 'hebrew-calendar-m5', 'hebrew-calendar-m6',
+               'hebrew-calendar-m7', 'hebrew-calendar-m8', 'hebrew-calendar-m9',
+               'hebrew-calendar-m10', 'hebrew-calendar-m11', 'hebrew-calendar-m12',
+               'hebrew-calendar-m6a', 'hebrew-calendar-m6b'
+       );
+
+       static public $mHebrewCalendarMonthGenMsgs = array(
+               'hebrew-calendar-m1-gen', 'hebrew-calendar-m2-gen', 'hebrew-calendar-m3-gen',
+               'hebrew-calendar-m4-gen', 'hebrew-calendar-m5-gen', 'hebrew-calendar-m6-gen',
+               'hebrew-calendar-m7-gen', 'hebrew-calendar-m8-gen', 'hebrew-calendar-m9-gen',
+               'hebrew-calendar-m10-gen', 'hebrew-calendar-m11-gen', 'hebrew-calendar-m12-gen',
+               'hebrew-calendar-m6a-gen', 'hebrew-calendar-m6b-gen'
+       );
+
        /**
         * Create a language object for a given language code
         */
@@ -112,11 +125,11 @@ class Language {
                } else {
                        $class = 'Language' . str_replace( '-', '_', ucfirst( $code ) );
                        // Preload base classes to work around APC/PHP5 bug
-                       if ( file_exists( "$IP/languages/$class.deps.php" ) ) {
-                               include_once("$IP/languages/$class.deps.php");
+                       if ( file_exists( "$IP/languages/classes/$class.deps.php" ) ) {
+                               include_once("$IP/languages/classes/$class.deps.php");
                        }
-                       if ( file_exists( "$IP/languages/$class.php" ) ) {
-                               include_once("$IP/languages/$class.php");
+                       if ( file_exists( "$IP/languages/classes/$class.php" ) ) {
+                               include_once("$IP/languages/classes/$class.php");
                        }
                }
 
@@ -158,9 +171,15 @@ class Language {
         * @return array
         */
        function getDefaultUserOptions() {
+               trigger_error( 'Use of ' . __METHOD__ . ' is deprecated', E_USER_NOTICE );
                return User::getDefaultOptions();
        }
 
+       function getFallbackLanguageCode() {
+               $this->load();
+               return $this->fallback;
+       }
+
        /**
         * Exports $wgBookstoreListEn
         * @return array
@@ -222,19 +241,31 @@ class Language {
        }
 
        /**
-        * Get a namespace key by value, case insensetive.
+        * Get a namespace key by value, case insensitive.
+        * Only matches namespace names for the current language, not the
+        * canonical ones defined in Namespace.php.
+        *
+        * @param string $text
+        * @return mixed An integer if $text is a valid value otherwise false
+        */
+       function getLocalNsIndex( $text ) {
+               $this->load();
+               $lctext = $this->lc($text);
+               return isset( $this->mNamespaceIds[$lctext] ) ? $this->mNamespaceIds[$lctext] : false;
+       }
+
+       /**
+        * Get a namespace key by value, case insensitive.  Canonical namespace
+        * names override custom ones defined for the current language.
         *
         * @param string $text
         * @return mixed An integer if $text is a valid value otherwise false
         */
        function getNsIndex( $text ) {
                $this->load();
-               $index = @$this->mNamespaceIds[$this->lc($text)];
-               if ( is_null( $index ) ) {
-                       return false;
-               } else {
-                       return $index;
-               }
+               $lctext = $this->lc($text);
+               if( ( $ns = Namespace::getCanonicalIndex( $lctext ) ) !== null ) return $ns;
+               return isset( $this->mNamespaceIds[$lctext] ) ? $this->mNamespaceIds[$lctext] : false;
        }
 
        /**
@@ -248,12 +279,21 @@ class Language {
        }
 
        function specialPage( $name ) {
+               $aliases = $this->getSpecialPageAliases();
+               if ( isset( $aliases[$name][0] ) ) {
+                       $name = $aliases[$name][0];
+               }
                return $this->getNsText(NS_SPECIAL) . ':' . $name;
        }
 
        function getQuickbarSettings() {
-               $this->load();
-               return $this->quickbarSettings;
+               return array(
+                       $this->getMessage( 'qbsettings-none' ),
+                       $this->getMessage( 'qbsettings-fixedleft' ),
+                       $this->getMessage( 'qbsettings-fixedright' ),
+                       $this->getMessage( 'qbsettings-floatingleft' ),
+                       $this->getMessage( 'qbsettings-floatingright' )
+               );
        }
 
        function getSkinNames() {
@@ -276,6 +316,11 @@ class Language {
                return $this->dateFormats;
        }
 
+       function getDefaultDateFormat() {
+               $this->load();
+               return $this->defaultDateFormat;
+       }
+
        function getDatePreferenceMigrationMap() {
                $this->load();
                return $this->datePreferenceMigrationMap;
@@ -283,7 +328,12 @@ class Language {
 
        function getDefaultUserOptionOverrides() {
                $this->load();
-               return $this->defaultUserOptionOverrides;
+               # XXX - apparently some languageas get empty arrays, didn't get to it yet -- midom
+               if (is_array($this->defaultUserOptionOverrides)) {
+                       return $this->defaultUserOptionOverrides;
+               } else {
+                       return array();
+               }
        }
 
        function getExtraUserToggles() {
@@ -299,23 +349,26 @@ class Language {
         * Get language names, indexed by code.
         * If $customisedOnly is true, only returns codes with a messages file
         */
-       function getLanguageNames( $customisedOnly = false ) {
-               global $wgLanguageNames;
+       public static function getLanguageNames( $customisedOnly = false ) {
+               global $wgLanguageNames, $wgExtraLanguageNames;
+               $allNames = $wgExtraLanguageNames + $wgLanguageNames;
                if ( !$customisedOnly ) {
-                       return $wgLanguageNames;
+                       return $allNames;
                }
                
                global $IP;
-               $messageFiles = glob( "$IP/languages/Messages*.php" );
                $names = array();
-               foreach ( $messageFiles as $file ) {
+               $dir = opendir( "$IP/languages/messages" );
+               while( false !== ( $file = readdir( $dir ) ) ) {
+                       $m = array();
                        if( preg_match( '/Messages([A-Z][a-z_]+)\.php$/', $file, $m ) ) {
                                $code = str_replace( '_', '-', strtolower( $m[1] ) );
-                               if ( isset( $wgLanguageNames[$code] ) ) {
-                                       $names[$code] = $wgLanguageNames[$code];
+                               if ( isset( $allNames[$code] ) ) {
+                                       $names[$code] = $allNames[$code];
                                }
                        }
                }
+               closedir( $dir );
                return $names;
        }
 
@@ -338,11 +391,11 @@ class Language {
        }
 
        function getLanguageName( $code ) {
-               global $wgLanguageNames;
-               if ( ! array_key_exists( $code, $wgLanguageNames ) ) {
+               $names = self::getLanguageNames();
+               if ( !array_key_exists( $code, $names ) ) {
                        return '';
                }
-               return $wgLanguageNames[$code];
+               return $names[$code];
        }
 
        function getMonthName( $key ) {
@@ -365,6 +418,19 @@ class Language {
                return $this->getMessageFromDB( self::$mWeekdayAbbrevMsgs[$key-1] );
        }
 
+       function getIranianCalendarMonthName( $key ) {
+               return $this->getMessageFromDB( self::$mIranianCalendarMonthMsgs[$key-1] );
+       }
+
+       function getHebrewCalendarMonthName( $key ) {
+               return $this->getMessageFromDB( self::$mHebrewCalendarMonthMsgs[$key-1] );
+       }
+
+       function getHebrewCalendarMonthNameGen( $key ) {
+               return $this->getMessageFromDB( self::$mHebrewCalendarMonthGenMsgs[$key-1] );
+       }
+
+
        /**
         * Used by date() and time() to adjust the time output.
         * @public
@@ -387,8 +453,12 @@ class Language {
                if ( $tz === '' ) {
                        # Global offset in minutes.
                        if( isset($wgLocalTZoffset) ) {
-                               $hrDiff = $wgLocalTZoffset % 60;
-                               $minDiff = $wgLocalTZoffset - ($hrDiff * 60);
+                               if( $wgLocalTZoffset >= 0 ) {
+                                       $hrDiff = floor($wgLocalTZoffset / 60);
+                               } else {
+                                       $hrDiff = ceil($wgLocalTZoffset / 60);
+                               }
+                               $minDiff = $wgLocalTZoffset % 60;
                        }
                } elseif ( strpos( $tz, ':' ) !== false ) {
                        $tzArray = explode( ':', $tz );
@@ -401,7 +471,8 @@ class Language {
                # No difference ? Return time unchanged
                if ( 0 == $hrDiff && 0 == $minDiff ) { return $ts; }
 
-               # Generate an adjusted date
+               wfSuppressWarnings(); // E_STRICT system time bitching
+               # Generate an adjusted date
                $t = mktime( (
                  (int)substr( $ts, 8, 2) ) + $hrDiff, # Hours
                  (int)substr( $ts, 10, 2 ) + $minDiff, # Minutes
@@ -409,7 +480,11 @@ class Language {
                  (int)substr( $ts, 4, 2 ), # Month
                  (int)substr( $ts, 6, 2 ), # Day
                  (int)substr( $ts, 0, 4 ) ); #Year
-               return date( 'YmdHis', $t );
+               
+               $date = date( 'YmdHis', $t );
+               wfRestoreWarnings();
+               
+               return $date;
        }
 
        /**
@@ -417,14 +492,32 @@ class Language {
         * internationalisation, a reduced set of format characters, and a better 
         * escaping format.
         *
-        * Supported format characters are dDjlFmMnYyHis. See the PHP manual for 
-        * definitions. There are a number of extensions, which start with "x":
+        * Supported format characters are dDjlNwzWFmMntLYyaAgGhHiscrU. See the 
+        * PHP manual for definitions. There are a number of extensions, which 
+        * start with "x":
         *
         *    xn   Do not translate digits of the next numeric format character
+        *    xN   Toggle raw digit (xn) flag, stays set until explicitly unset
         *    xr   Use roman numerals for the next numeric format character
+        *    xh   Use hebrew numerals for the next numeric format character
         *    xx   Literal x
         *    xg   Genitive month name
         *
+        *    xij  j (day number) in Iranian calendar
+        *    xiF  F (month name) in Iranian calendar
+        *    xin  n (month number) in Iranian calendar
+        *    xiY  Y (full year) in Iranian calendar
+        *
+        *    xjj  j (day number) in Hebrew calendar
+        *    xjF  F (month name) in Hebrew calendar
+        *    xjt  t (days in month) in Hebrew calendar
+        *    xjx  xg (genitive month name) in Hebrew calendar
+        *    xjn  n (month number) in Hebrew calendar
+        *    xjY  Y (full year) in Hebrew calendar
+        *
+        *    xkY  Y (full year) in Thai solar calendar. Months and days are
+        *                       identical to the Gregorian calendar
+        *
         * Characters enclosed in double quotes will be considered literal (with
         * the quotes themselves removed). Unmatched quotes will be considered
         * literal quotes. Example:
@@ -433,6 +526,9 @@ class Language {
         * i's"                   => 20'11"
         *
         * Backslash escaping is also supported.
+        *
+        * Input timestamp is assumed to be pre-normalized to the desired local
+        * time zone, if any.
         * 
         * @param string $format
         * @param string $ts 14-character timestamp
@@ -443,13 +539,23 @@ class Language {
                $s = '';
                $raw = false;
                $roman = false;
+               $hebrewNum = false;
+               $unix = false;
+               $rawToggle = false;
+               $iranian = false;
+               $hebrew = false;
+               $thai = false;
                for ( $p = 0; $p < strlen( $format ); $p++ ) {
                        $num = false;
                        $code = $format[$p];
                        if ( $code == 'x' && $p < strlen( $format ) - 1 ) {
                                $code .= $format[++$p];
                        }
-                       
+
+                       if ( ( $code === 'xi' || $code == 'xj' || $code == 'xk' ) && $p < strlen( $format ) - 1 ) {
+                               $code .= $format[++$p];
+                       }
+
                        switch ( $code ) {
                                case 'xx':
                                        $s .= 'x';
@@ -457,27 +563,72 @@ class Language {
                                case 'xn':
                                        $raw = true;
                                        break;
+                               case 'xN':
+                                       $rawToggle = !$rawToggle;
+                                       break;
                                case 'xr':
                                        $roman = true;
                                        break;
+                               case 'xh':
+                                       $hebrewNum = true;
+                                       break;
                                case 'xg':
                                        $s .= $this->getMonthNameGen( substr( $ts, 4, 2 ) );
                                        break;
+                               case 'xjx':
+                                       if ( !$hebrew ) $hebrew = self::tsToHebrew( $ts );
+                                       $s .= $this->getHebrewCalendarMonthNameGen( $hebrew[1] );
+                                       break;
                                case 'd':
                                        $num = substr( $ts, 6, 2 );
                                        break;
                                case 'D':
-                                       $s .= $this->getWeekdayAbbreviation( self::calculateWeekday( $ts ) );
+                                       if ( !$unix ) $unix = wfTimestamp( TS_UNIX, $ts );
+                                       $s .= $this->getWeekdayAbbreviation( gmdate( 'w', $unix ) + 1 );
                                        break;
                                case 'j':
                                        $num = intval( substr( $ts, 6, 2 ) );
                                        break;
+                               case 'xij':
+                                       if ( !$iranian ) $iranian = self::tsToIranian( $ts );
+                                       $num = $iranian[2];
+                                       break;
+                               case 'xjj':
+                                       if ( !$hebrew ) $hebrew = self::tsToHebrew( $ts );
+                                       $num = $hebrew[2];
+                                       break;
                                case 'l':
-                                       $s .= $this->getWeekdayName( self::calculateWeekday( $ts ) );
+                                       if ( !$unix ) $unix = wfTimestamp( TS_UNIX, $ts );
+                                       $s .= $this->getWeekdayName( gmdate( 'w', $unix ) + 1 );
+                                       break;
+                               case 'N':
+                                       if ( !$unix ) $unix = wfTimestamp( TS_UNIX, $ts );
+                                       $w = gmdate( 'w', $unix );
+                                       $num = $w ? $w : 7;
+                                       break;
+                               case 'w':
+                                       if ( !$unix ) $unix = wfTimestamp( TS_UNIX, $ts );
+                                       $num = gmdate( 'w', $unix );
+                                       break;
+                               case 'z':
+                                       if ( !$unix ) $unix = wfTimestamp( TS_UNIX, $ts );
+                                       $num = gmdate( 'z', $unix );
+                                       break;
+                               case 'W':
+                                       if ( !$unix ) $unix = wfTimestamp( TS_UNIX, $ts );
+                                       $num = gmdate( 'W', $unix );
                                        break;
                                case 'F':
                                        $s .= $this->getMonthName( substr( $ts, 4, 2 ) );
                                        break;
+                               case 'xiF':
+                                       if ( !$iranian ) $iranian = self::tsToIranian( $ts );
+                                       $s .= $this->getIranianCalendarMonthName( $iranian[1] );
+                                       break;
+                               case 'xjF':
+                                       if ( !$hebrew ) $hebrew = self::tsToHebrew( $ts );
+                                       $s .= $this->getHebrewCalendarMonthName( $hebrew[1] );
+                                       break;
                                case 'm':
                                        $num = substr( $ts, 4, 2 );
                                        break;
@@ -487,24 +638,82 @@ class Language {
                                case 'n':
                                        $num = intval( substr( $ts, 4, 2 ) );
                                        break;
+                               case 'xin':
+                                       if ( !$iranian ) $iranian = self::tsToIranian( $ts );
+                                       $num = $iranian[1];
+                                       break;
+                               case 'xjn':
+                                       if ( !$hebrew ) $hebrew = self::tsToHebrew( $ts );
+                                       $num = $hebrew[1];
+                                       break;
+                               case 't':
+                                       if ( !$unix ) $unix = wfTimestamp( TS_UNIX, $ts );
+                                       $num = gmdate( 't', $unix );
+                                       break;
+                               case 'xjt':
+                                       if ( !$hebrew ) $hebrew = self::tsToHebrew( $ts );
+                                       $num = $hebrew[3];
+                                       break;
+                               case 'L':
+                                       if ( !$unix ) $unix = wfTimestamp( TS_UNIX, $ts );
+                                       $num = gmdate( 'L', $unix );
+                                       break;
                                case 'Y':
                                        $num = substr( $ts, 0, 4 );
                                        break;
+                               case 'xiY':
+                                       if ( !$iranian ) $iranian = self::tsToIranian( $ts );
+                                       $num = $iranian[0];
+                                       break;
+                               case 'xjY':
+                                       if ( !$hebrew ) $hebrew = self::tsToHebrew( $ts );
+                                       $num = $hebrew[0];
+                                       break;
+                               case 'xkY':
+                                       if ( !$thai ) $thai = self::tsToThai( $ts );
+                                       $num = $thai[0];
+                                       break;
                                case 'y':
                                        $num = substr( $ts, 2, 2 );
                                        break;
-                               case 'H':
-                                       $num = substr( $ts, 8, 2 );
+                               case 'a':
+                                       $s .= intval( substr( $ts, 8, 2 ) ) < 12 ? 'am' : 'pm';
+                                       break;
+                               case 'A':
+                                       $s .= intval( substr( $ts, 8, 2 ) ) < 12 ? 'AM' : 'PM';
+                                       break;
+                               case 'g':
+                                       $h = substr( $ts, 8, 2 );
+                                       $num = $h % 12 ? $h % 12 : 12;
                                        break;
                                case 'G':
                                        $num = intval( substr( $ts, 8, 2 ) );
                                        break;
+                               case 'h':
+                                       $h = substr( $ts, 8, 2 );
+                                       $num = sprintf( '%02d', $h % 12 ? $h % 12 : 12 );
+                                       break;                                  
+                               case 'H':
+                                       $num = substr( $ts, 8, 2 );
+                                       break;
                                case 'i':
                                        $num = substr( $ts, 10, 2 );
                                        break;
                                case 's':
                                        $num = substr( $ts, 12, 2 );
                                        break;
+                               case 'c':
+                                       if ( !$unix ) $unix = wfTimestamp( TS_UNIX, $ts );
+                                       $s .= gmdate( 'c', $unix );
+                                       break;
+                               case 'r':
+                                       if ( !$unix ) $unix = wfTimestamp( TS_UNIX, $ts );
+                                       $s .= gmdate( 'r', $unix );
+                                       break;
+                               case 'U':
+                                       if ( !$unix ) $unix = wfTimestamp( TS_UNIX, $ts );
+                                       $num = $unix;
+                                       break;
                                case '\\':
                                        # Backslash escaping
                                        if ( $p < strlen( $format ) - 1 ) {
@@ -533,12 +742,15 @@ class Language {
                                        $s .= $format[$p];
                        }
                        if ( $num !== false ) {
-                               if ( $raw ) {
+                               if ( $rawToggle || $raw ) {
                                        $s .= $num;
                                        $raw = false;
                                } elseif ( $roman ) {
-                                       $s .= Language::romanNumeral( $num );
+                                       $s .= self::romanNumeral( $num );
                                        $roman = false;
+                               } elseif( $hebrewNum ) {
+                                       $s .= self::hebrewNumeral( $num );
+                                       $hebrewNum = false;
                                } else {
                                        $s .= $this->formatNum( $num, true );
                                }
@@ -548,34 +760,339 @@ class Language {
                return $s;
        }
 
+       private static $GREG_DAYS = array( 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 );
+       private static $IRANIAN_DAYS = array( 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 29 );
+       /**
+        * Algorithm by Roozbeh Pournader and Mohammad Toossi to convert 
+        * Gregorian dates to Iranian dates. Originally written in C, it
+        * is released under the terms of GNU Lesser General Public
+        * License. Conversion to PHP was performed by Niklas Laxström.
+        * 
+        * Link: http://www.farsiweb.info/jalali/jalali.c
+        */
+       private static function tsToIranian( $ts ) {
+               $gy = substr( $ts, 0, 4 ) -1600;
+               $gm = substr( $ts, 4, 2 ) -1;
+               $gd = substr( $ts, 6, 2 ) -1;
+
+               # Days passed from the beginning (including leap years)
+               $gDayNo = 365*$gy
+                       + floor(($gy+3) / 4)
+                       - floor(($gy+99) / 100)
+                       + floor(($gy+399) / 400);
+
+
+               // Add days of the past months of this year
+               for( $i = 0; $i < $gm; $i++ ) {
+                       $gDayNo += self::$GREG_DAYS[$i];
+               }
+
+               // Leap years
+               if ( $gm > 1 && (($gy%4===0 && $gy%100!==0 || ($gy%400==0)))) {
+                       $gDayNo++;
+               }
+
+               // Days passed in current month
+               $gDayNo += $gd;
+               
+               $jDayNo = $gDayNo - 79;
+
+               $jNp = floor($jDayNo / 12053);
+               $jDayNo %= 12053;
+
+               $jy = 979 + 33*$jNp + 4*floor($jDayNo/1461);
+               $jDayNo %= 1461;
+
+               if ( $jDayNo >= 366 ) {
+                       $jy += floor(($jDayNo-1)/365);
+                       $jDayNo = floor(($jDayNo-1)%365);
+               }
+
+               for ( $i = 0; $i < 11 && $jDayNo >= self::$IRANIAN_DAYS[$i]; $i++ ) {
+                       $jDayNo -= self::$IRANIAN_DAYS[$i];
+               }
+
+               $jm= $i+1;
+               $jd= $jDayNo+1;
+
+               return array($jy, $jm, $jd);
+       }
+
+       /**
+        * Converting Gregorian dates to Hebrew dates.
+        *
+        * Based on a JavaScript code by Abu Mami and Yisrael Hersch
+        * (abu-mami@kaluach.net, http://www.kaluach.net), who permitted
+        * to translate the relevant functions into PHP and release them under
+        * GNU GPL.
+        */
+       private static function tsToHebrew( $ts ) {
+               # Parse date
+               $year = substr( $ts, 0, 4 );
+               $month = substr( $ts, 4, 2 );
+               $day = substr( $ts, 6, 2 );
+
+               # Calculate Hebrew year
+               $hebrewYear = $year + 3760;
+
+               # Month number when September = 1, August = 12
+               $month += 4;
+               if( $month > 12 ) {
+                       # Next year
+                       $month -= 12;
+                       $year++;
+                       $hebrewYear++;
+               }
+
+               # Calculate day of year from 1 September
+               $dayOfYear = $day;
+               for( $i = 1; $i < $month; $i++ ) {
+                       if( $i == 6 ) {
+                               # February
+                               $dayOfYear += 28;
+                               # Check if the year is leap
+                               if( $year % 400 == 0 || ( $year % 4 == 0 && $year % 100 > 0 ) ) {
+                                       $dayOfYear++;
+                               }
+                       } elseif( $i == 8 || $i == 10 || $i == 1 || $i == 3 ) {
+                               $dayOfYear += 30;
+                       } else {
+                               $dayOfYear += 31;
+                       }
+               }
+
+               # Calculate the start of the Hebrew year
+               $start = self::hebrewYearStart( $hebrewYear );
+
+               # Calculate next year's start
+               if( $dayOfYear <= $start ) {
+                       # Day is before the start of the year - it is the previous year
+                       # Next year's start
+                       $nextStart = $start;
+                       # Previous year
+                       $year--;
+                       $hebrewYear--;
+                       # Add days since previous year's 1 September
+                       $dayOfYear += 365;
+                       if( ( $year % 400 == 0 ) || ( $year % 100 != 0 && $year % 4 == 0 ) ) {
+                               # Leap year
+                               $dayOfYear++;
+                       }
+                       # Start of the new (previous) year
+                       $start = self::hebrewYearStart( $hebrewYear );
+               } else {
+                       # Next year's start
+                       $nextStart = self::hebrewYearStart( $hebrewYear + 1 );
+               }
+
+               # Calculate Hebrew day of year
+               $hebrewDayOfYear = $dayOfYear - $start;
+
+               # Difference between year's days
+               $diff = $nextStart - $start;
+               # Add 12 (or 13 for leap years) days to ignore the difference between
+               # Hebrew and Gregorian year (353 at least vs. 365/6) - now the
+               # difference is only about the year type
+               if( ( $year % 400 == 0 ) || ( $year % 100 != 0 && $year % 4 == 0 ) ) {
+                       $diff += 13;
+               } else {
+                       $diff += 12;
+               }
+
+               # Check the year pattern, and is leap year
+               # 0 means an incomplete year, 1 means a regular year, 2 means a complete year
+               # This is mod 30, to work on both leap years (which add 30 days of Adar I)
+               # and non-leap years
+               $yearPattern = $diff % 30;
+               # Check if leap year
+               $isLeap = $diff >= 30;
+
+               # Calculate day in the month from number of day in the Hebrew year
+               # Don't check Adar - if the day is not in Adar, we will stop before;
+               # if it is in Adar, we will use it to check if it is Adar I or Adar II
+               $hebrewDay = $hebrewDayOfYear;
+               $hebrewMonth = 1;
+               $days = 0;
+               while( $hebrewMonth <= 12 ) {
+                       # Calculate days in this month
+                       if( $isLeap && $hebrewMonth == 6 ) {
+                               # Adar in a leap year
+                               if( $isLeap ) {
+                                       # Leap year - has Adar I, with 30 days, and Adar II, with 29 days
+                                       $days = 30;
+                                       if( $hebrewDay <= $days ) {
+                                               # Day in Adar I
+                                               $hebrewMonth = 13;
+                                       } else {
+                                               # Subtract the days of Adar I
+                                               $hebrewDay -= $days;
+                                               # Try Adar II
+                                               $days = 29;
+                                               if( $hebrewDay <= $days ) {
+                                                       # Day in Adar II
+                                                       $hebrewMonth = 14;
+                                               }
+                                       }
+                               }
+                       } elseif( $hebrewMonth == 2 && $yearPattern == 2 ) {
+                               # Cheshvan in a complete year (otherwise as the rule below)
+                               $days = 30;
+                       } elseif( $hebrewMonth == 3 && $yearPattern == 0 ) {
+                               # Kislev in an incomplete year (otherwise as the rule below)
+                               $days = 29;
+                       } else {
+                               # Odd months have 30 days, even have 29
+                               $days = 30 - ( $hebrewMonth - 1 ) % 2;
+                       }
+                       if( $hebrewDay <= $days ) {
+                               # In the current month
+                               break;
+                       } else {
+                               # Subtract the days of the current month
+                               $hebrewDay -= $days;
+                               # Try in the next month
+                               $hebrewMonth++;
+                       }
+               }
+
+               return array( $hebrewYear, $hebrewMonth, $hebrewDay, $days );
+       }
+
        /**
-        * Roman number formatting up to 100
+        * This calculates the Hebrew year start, as days since 1 September.
+        * Based on Carl Friedrich Gauss algorithm for finding Easter date.
+        * Used for Hebrew date.
+        */
+       private static function hebrewYearStart( $year ) {
+               $a = intval( ( 12 * ( $year - 1 ) + 17 ) % 19 );
+               $b = intval( ( $year - 1 ) % 4 );
+               $m = 32.044093161144 + 1.5542417966212 * $a +  $b / 4.0 - 0.0031777940220923 * ( $year - 1 );
+               if( $m < 0 ) {
+                       $m--;
+               }
+               $Mar = intval( $m );
+               if( $m < 0 ) {
+                       $m++;
+               }
+               $m -= $Mar;
+
+               $c = intval( ( $Mar + 3 * ( $year - 1 ) + 5 * $b + 5 ) % 7);
+               if( $c == 0 && $a > 11 && $m >= 0.89772376543210 ) {
+                       $Mar++;
+               } else if( $c == 1 && $a > 6 && $m >= 0.63287037037037 ) {
+                       $Mar += 2;
+               } else if( $c == 2 || $c == 4 || $c == 6 ) {
+                       $Mar++;
+               }
+
+               $Mar += intval( ( $year - 3761 ) / 100 ) - intval( ( $year - 3761 ) / 400 ) - 24;
+               return $Mar;
+       }
+
+       /**
+        * Algorithm to convert Gregorian dates to Thai solar dates.
+        *
+        * Link: http://en.wikipedia.org/wiki/Thai_solar_calendar
+        *
+        * @param string $ts 14-character timestamp
+        * @return array converted year, month, day
+        */
+       private static function tsToThai( $ts ) {
+               $gy = substr( $ts, 0, 4 );
+               $gm = substr( $ts, 4, 2 );
+               $gd = substr( $ts, 6, 2 );
+
+               # Add 543 years to the Gregorian calendar
+               # Months and days are identical
+               $gy_thai = $gy + 543;
+
+               return array( $gy_thai, $gm, $gd );
+       }
+
+
+       /**
+        * Roman number formatting up to 3000
         */
        static function romanNumeral( $num ) {
-               static $units = array( 0, 'I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX', 'X' );
-               static $decades = array( 0, 'X', 'XX', 'XXX', 'XL', 'L', 'LX', 'LXX', 'LXXX', 'XC', 'C' );
+               static $table = array(
+                       array( '', 'I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX', 'X' ),
+                       array( '', 'X', 'XX', 'XXX', 'XL', 'L', 'LX', 'LXX', 'LXXX', 'XC', 'C' ),
+                       array( '', 'C', 'CC', 'CCC', 'CD', 'D', 'DC', 'DCC', 'DCCC', 'CM', 'M' ),
+                       array( '', 'M', 'MM', 'MMM' )
+               );
+                       
                $num = intval( $num );
-               if ( $num > 100 || $num <= 0 ) {
+               if ( $num > 3000 || $num <= 0 ) {
                        return $num;
                }
+
                $s = '';
-               if ( $num >= 10 ) {
-                       $s .= $decades[floor( $num / 10 )];
-                       $num = $num % 10;
-               }
-               if ( $num >= 1 ) {
-                       $s .= $units[$num];
+               for ( $pow10 = 1000, $i = 3; $i >= 0; $pow10 /= 10, $i-- ) {
+                       if ( $num >= $pow10 ) {
+                               $s .= $table[$i][floor($num / $pow10)];
+                       }
+                       $num = $num % $pow10;
                }
                return $s;
        }
 
-       /**
-        * Calculate the day of the week for a 14-character timestamp
-        * 1 for Sunday through to 7 for Saturday
-        * This takes about 100us on a slow computer
+       /**
+        * Hebrew Gematria number formatting up to 9999
         */
-       static function calculateWeekday( $ts ) {
-               return date( 'w', wfTimestamp( TS_UNIX, $ts ) ) + 1;
+       static function hebrewNumeral( $num ) {
+               static $table = array(
+                       array( '', 'א', 'ב', 'ג', 'ד', 'ה', 'ו', 'ז', 'ח', 'ט', 'י' ),
+                       array( '', 'י', 'כ', 'ל', 'מ', 'נ', 'ס', 'ע', 'פ', 'צ', 'ק' ),
+                       array( '', 'ק', 'ר', 'ש', 'ת', 'תק', 'תר', 'תש', 'תת', 'תתק', 'תתר' ),
+                       array( '', 'א', 'ב', 'ג', 'ד', 'ה', 'ו', 'ז', 'ח', 'ט', 'י' )
+               );
+
+               $num = intval( $num );
+               if ( $num > 9999 || $num <= 0 ) {
+                       return $num;
+               }
+
+               $s = '';
+               for ( $pow10 = 1000, $i = 3; $i >= 0; $pow10 /= 10, $i-- ) {
+                       if ( $num >= $pow10 ) {
+                               if ( $num == 15 || $num == 16 ) {
+                                       $s .= $table[0][9] . $table[0][$num - 9];
+                                       $num = 0;
+                               } else {
+                                       $s .= $table[$i][intval( ( $num / $pow10 ) )];
+                                       if( $pow10 == 1000 ) {
+                                               $s .= "'";
+                                       }
+                               }
+                       }
+                       $num = $num % $pow10;
+               }
+               if( strlen( $s ) == 2 ) {
+                       $str = $s . "'";
+               } else  {
+                       $str = substr( $s, 0, strlen( $s ) - 2 ) . '"';
+                       $str .= substr( $s, strlen( $s ) - 2, 2 );
+               }
+               $start = substr( $str, 0, strlen( $str ) - 2 );
+               $end = substr( $str, strlen( $str ) - 2 );
+               switch( $end ) {
+                       case 'כ':
+                               $str = $start . 'ך';
+                               break;
+                       case 'מ':
+                               $str = $start . 'ם';
+                               break;
+                       case 'נ':
+                               $str = $start . 'ן';
+                               break;
+                       case 'פ':
+                               $str = $start . 'ף';
+                               break;
+                       case 'צ':
+                               $str = $start . 'ץ';
+                               break;
+               }
+               return $str;
        }
 
        /**
@@ -680,6 +1197,9 @@ class Language {
        */
        function timeanddate( $ts, $adj = false, $format = true, $timecorrection = false) {
                $this->load();
+
+               $ts = wfTimestamp( TS_MW, $ts );
+
                if ( $adj ) { 
                        $ts = $this->userAdjust( $ts, $timecorrection ); 
                }
@@ -694,7 +1214,7 @@ class Language {
 
        function getMessage( $key ) {
                $this->load();
-               return @$this->messages[$key];
+               return isset( $this->messages[$key] ) ? $this->messages[$key] : null;
        }
 
        function getAllMessages() {
@@ -704,37 +1224,77 @@ class Language {
 
        function iconv( $in, $out, $string ) {
                # For most languages, this is a wrapper for iconv
-               return iconv( $in, $out, $string );
+               return iconv( $in, $out . '//IGNORE', $string );
+       }
+
+       // callback functions for uc(), lc(), ucwords(), ucwordbreaks()
+       function ucwordbreaksCallbackAscii($matches){
+               return $this->ucfirst($matches[1]);
+       }
+       
+       function ucwordbreaksCallbackMB($matches){
+               return mb_strtoupper($matches[0]);
+       }
+       
+       function ucCallback($matches){
+               list( $wikiUpperChars ) = self::getCaseMaps();
+               return strtr( $matches[1], $wikiUpperChars );
+       }
+       
+       function lcCallback($matches){
+               list( , $wikiLowerChars ) = self::getCaseMaps();
+               return strtr( $matches[1], $wikiLowerChars );
+       }
+       
+       function ucwordsCallbackMB($matches){
+               return mb_strtoupper($matches[0]);
+       }
+       
+       function ucwordsCallbackWiki($matches){
+               list( $wikiUpperChars ) = self::getCaseMaps();
+               return strtr( $matches[0], $wikiUpperChars );
        }
 
        function ucfirst( $str ) {
-               return self::uc( $str, true );
+               if ( empty($str) ) return $str;
+               if ( ord($str[0]) < 128 ) return ucfirst($str);
+               else return self::uc($str,true); // fall back to more complex logic in case of multibyte strings
        }
 
        function uc( $str, $first = false ) {
-               if ( function_exists( 'mb_strtoupper' ) )
-                       if ( $first )
-                               if ( self::isMultibyte( $str ) )
+               if ( function_exists( 'mb_strtoupper' ) ) {
+                       if ( $first ) {
+                               if ( self::isMultibyte( $str ) ) {
                                        return mb_strtoupper( mb_substr( $str, 0, 1 ) ) . mb_substr( $str, 1 );
-                               else
+                               } else {
                                        return ucfirst( $str );
-                       else
+                               }
+                       } else {
                                return self::isMultibyte( $str ) ? mb_strtoupper( $str ) : strtoupper( $str );
-               else
+                       }
+               } else {
                        if ( self::isMultibyte( $str ) ) {
                                list( $wikiUpperChars ) = $this->getCaseMaps();
                                $x = $first ? '^' : '';
-                               return preg_replace(
-                                       "/$x([a-z]|[\\xc0-\\xff][\\x80-\\xbf]*)/e",
-                                       "strtr( \"\$1\" , \$wikiUpperChars )",
+                               return preg_replace_callback(
+                                       "/$x([a-z]|[\\xc0-\\xff][\\x80-\\xbf]*)/",
+                                       array($this,"ucCallback"),
                                        $str
                                );
-                       } else
+                       } else {
                                return $first ? ucfirst( $str ) : strtoupper( $str );
+                       }
+               }
        }
        
        function lcfirst( $str ) {
-               return self::lc( $str, true );
+               if ( empty($str) ) return $str;
+               if ( is_string( $str ) && ord($str[0]) < 128 ) {
+                       // editing string in place = cool
+                       $str[0]=strtolower($str[0]);
+                       return $str;
+               }
+               else return self::lc( $str, true );
        }
 
        function lc( $str, $first = false ) {
@@ -750,9 +1310,9 @@ class Language {
                        if ( self::isMultibyte( $str ) ) {
                                list( , $wikiLowerChars ) = self::getCaseMaps();
                                $x = $first ? '^' : '';
-                               return preg_replace(
-                                       "/$x([A-Z]|[\\xc0-\\xff][\\x80-\\xbf]*)/e",
-                                       "strtr( \"\$1\" , \$wikiLowerChars )",
+                               return preg_replace_callback(
+                                       "/$x([A-Z]|[\\xc0-\\xff][\\x80-\\xbf]*)/",
+                                       array($this,"lcCallback"),
                                        $str
                                );
                        } else
@@ -760,7 +1320,78 @@ class Language {
        }
 
        function isMultibyte( $str ) {
-               return (bool)preg_match( '/^[\x80-\xff]/', $str );
+               return (bool)preg_match( '/[\x80-\xff]/', $str );
+       }
+
+       function ucwords($str) {
+               if ( self::isMultibyte( $str ) ) {
+                       $str = self::lc($str);
+
+                       // regexp to find first letter in each word (i.e. after each space)
+                       $replaceRegexp = "/^([a-z]|[\\xc0-\\xff][\\x80-\\xbf]*)| ([a-z]|[\\xc0-\\xff][\\x80-\\xbf]*)/";
+
+                       // function to use to capitalize a single char
+                       if ( function_exists( 'mb_strtoupper' ) )
+                               return preg_replace_callback(
+                                       $replaceRegexp,
+                                       array($this,"ucwordsCallbackMB"),
+                                       $str
+                               );
+                       else 
+                               return preg_replace_callback(
+                                       $replaceRegexp,
+                                       array($this,"ucwordsCallbackWiki"),
+                                       $str
+                               );
+               }
+               else
+                       return ucwords( strtolower( $str ) );
+       }
+
+  # capitalize words at word breaks
+       function ucwordbreaks($str){
+               if (self::isMultibyte( $str ) ) {
+                       $str = self::lc($str);
+
+                       // since \b doesn't work for UTF-8, we explicitely define word break chars
+                       $breaks= "[ \-\(\)\}\{\.,\?!]";
+
+                       // find first letter after word break
+                       $replaceRegexp = "/^([a-z]|[\\xc0-\\xff][\\x80-\\xbf]*)|$breaks([a-z]|[\\xc0-\\xff][\\x80-\\xbf]*)/";
+
+                       if ( function_exists( 'mb_strtoupper' ) )
+                               return preg_replace_callback(
+                                       $replaceRegexp,
+                                       array($this,"ucwordbreaksCallbackMB"),
+                                       $str
+                               );
+                       else 
+                               return preg_replace_callback(
+                                       $replaceRegexp,
+                                       array($this,"ucwordsCallbackWiki"),
+                                       $str
+                               );
+               }
+               else
+                       return preg_replace_callback(
+                       '/\b([\w\x80-\xff]+)\b/',
+                       array($this,"ucwordbreaksCallbackAscii"),
+                       $str );
+       }
+
+       /**
+        * Return a case-folded representation of $s
+        *
+        * This is a representation such that caseFold($s1)==caseFold($s2) if $s1 
+        * and $s2 are the same except for the case of their characters. It is not
+        * necessary for the value returned to make sense when displayed.
+        *
+        * Do *not* perform any other normalisation in this function. If a caller
+        * uses this function when it should be using a more general normalisation
+        * function, then fix the caller.
+        */
+       function caseFold( $s ) {
+               return $this->uc( $s );
        }
 
        function checkTitleEncoding( $s ) {
@@ -792,6 +1423,11 @@ class Language {
         * @return string
         */
        function stripForSearch( $string ) {
+               global $wgDBtype;
+               if ( $wgDBtype != 'mysql' ) {
+                       return $string;
+               }
+
                # MySQL fulltext index doesn't grok utf-8, so we
                # need to fold cases and convert to hex
 
@@ -825,6 +1461,7 @@ class Language {
         * @return string
         */
        function firstChar( $s ) {
+               $matches = array();
                preg_match( '/^([\x00-\x7f]|[\xc0-\xdf][\x80-\xbf]|' .
                '[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xf7][\x80-\xbf]{3})/', $s, $matches);
 
@@ -914,8 +1551,8 @@ class Language {
 
        # Fill a MagicWord object with data from here
        function getMagic( &$mw ) {
-               if ( !isset( $this->mMagicExtensions ) ) {
-                       $this->mMagicExtensions = array();
+               if ( !$this->mMagicHookDone ) {
+                       $this->mMagicHookDone = true;
                        wfRunHooks( 'LanguageGetMagic', array( &$this->mMagicExtensions, $this->getCode() ) );
                }
                if ( isset( $this->mMagicExtensions[$mw->mId] ) ) {
@@ -931,8 +1568,47 @@ class Language {
                        }
                }
 
-               $mw->mCaseSensitive = $rawEntry[0];
-               $mw->mSynonyms = array_slice( $rawEntry, 1 );
+               if( !is_array( $rawEntry ) ) {
+                       error_log( "\"$rawEntry\" is not a valid magic thingie for \"$mw->mId\"" );
+               } else {
+                       $mw->mCaseSensitive = $rawEntry[0];
+                       $mw->mSynonyms = array_slice( $rawEntry, 1 );
+               }
+       }
+
+       /**
+        * Add magic words to the extension array
+        */
+       function addMagicWordsByLang( $newWords ) {
+               $code = $this->getCode();
+               $fallbackChain = array();
+               while ( $code && !in_array( $code, $fallbackChain ) ) {
+                       $fallbackChain[] = $code;
+                       $code = self::getFallbackFor( $code );
+               }
+               if ( !in_array( 'en', $fallbackChain ) ) {
+                       $fallbackChain[] = 'en';
+               }
+               $fallbackChain = array_reverse( $fallbackChain );
+               foreach ( $fallbackChain as $code ) {
+                       if ( isset( $newWords[$code] ) ) {
+                               $this->mMagicExtensions = $newWords[$code] + $this->mMagicExtensions;
+                       }
+               }
+       }
+
+       /**
+        * Get special page names, as an associative array
+        *   case folded alias => real name
+        */
+       function getSpecialPageAliases() {
+               $this->load();
+               if ( !isset( $this->mExtendedSpecialPageAliases ) ) {
+                       $this->mExtendedSpecialPageAliases = $this->specialPageAliases;
+                       wfRunHooks( 'LanguageGetSpecialPageAliases', 
+                               array( &$this->mExtendedSpecialPageAliases, $this->getCode() ) );
+               }
+               return $this->mExtendedSpecialPageAliases;
        }
 
        /**
@@ -987,6 +1663,17 @@ class Language {
                return $number;
        }
 
+       function parseFormattedNumber( $number ) {
+               $s = $this->digitTransformTable();
+               if (!is_null($s)) { $number = strtr($number, array_flip($s)); }
+
+               $s = $this->separatorTransformTable();
+               if (!is_null($s)) { $number = strtr($number, array_flip($s)); }
+
+               $number = strtr( $number, array (',' => '') );
+               return $number;
+       }
+
        /**
         * Adds commas to a given number
         *
@@ -1029,13 +1716,21 @@ class Language {
                return $s;
        }
 
-       # Crop a string from the beginning or end to a certain number of bytes.
-       # (Bytes are used because our storage has limited byte lengths for some
-       # columns in the database.) Multibyte charsets will need to make sure that
-       # only whole characters are included!
-       #
-       # $length does not include the optional ellipsis.
-       # If $length is negative, snip from the beginning
+       /**
+        * Truncate a string to a specified length in bytes, appending an optional
+        * string (e.g. for ellipses)
+        *
+        * The database offers limited byte lengths for some columns in the database;
+        * multi-byte character sets mean we need to ensure that only whole characters
+        * are included, otherwise broken characters can be passed to the user
+        *
+        * If $length is negative, the string will be truncated from the beginning
+        *       
+        * @param string $string String to truncate
+        * @param int $length Maximum length (excluding ellipses)
+        * @param string $ellipses String to append to the truncated text
+        * @return string
+        */
        function truncate( $string, $length, $ellipsis = "" ) {
                if( $length == 0 ) {
                        return $ellipsis;
@@ -1046,6 +1741,7 @@ class Language {
                if( $length > 0 ) {
                        $string = substr( $string, 0, $length );
                        $char = ord( $string[strlen( $string ) - 1] );
+                       $m = array();
                        if ($char >= 0xc0) {
                                # We got the first byte only of a multibyte char; remove it.
                                $string = substr( $string, 0, -1 );
@@ -1077,15 +1773,15 @@ class Language {
         */
        function convertGrammar( $word, $case ) {
                global $wgGrammarForms;
-               if ( isset($wgGrammarForms['en'][$case][$word]) ) {
-                       return $wgGrammarForms['en'][$case][$word];
+               if ( isset($wgGrammarForms[$this->getCode()][$case][$word]) ) {
+                       return $wgGrammarForms[$this->getCode()][$case][$word];
                }
                return $word;
        }
 
        /**
         * Plural form transformations, needed for some languages.
-        * For example, where are 3 form of plural in Russian and Polish,
+        * For example, there are 3 form of plural in Russian and Polish,
         * depending on "count mod 10". See [[w:Plural]]
         * For English it is pretty simple.
         *
@@ -1094,14 +1790,30 @@ class Language {
         *
         * Example: {{plural:{{NUMBEROFARTICLES}}|article|articles}}
         *
-        * @param integer $count
-        * @param string $wordform1
-        * @param string $wordform2
-        * @param string $wordform3 (optional)
-        * @return string
+        * @param integer $count Non-localized number
+        * @param array $forms Different plural forms
+        * @return string Correct form of plural for $count in this language
+        */
+       function convertPlural( $count, $forms ) {
+               if ( !count($forms) ) { return ''; }
+               $forms = $this->preConvertPlural( $forms, 2 );
+
+               return ( abs($count) == 1 ) ? $forms[0] : $forms[1];
+       }
+
+       /**
+        * Checks that convertPlural was given an array and pads it to requested
+        * amound of forms by copying the last one.
+        *
+        * @param integer $count How many forms should there be at least
+        * @param array $forms Array of forms given to convertPlural
+        * @return array Padded array of forms or an exception if not an array
         */
-       function convertPlural( $count, $w1, $w2, $w3) {
-               return $count == '1' ? $w1 : $w2;
+       protected function preConvertPlural( /* Array */ $forms, $count ) {
+               while ( count($forms) < $count ) {
+                       $forms[] = $forms[count($forms)-1];
+               }
+               return $forms;
        }
 
        /**
@@ -1122,9 +1834,9 @@ class Language {
                        if ( strpos($option, ":") === false )
                                continue;
                        list($show, $value) = explode(":", $option);
-                       if ( strcmp ( $str, $value) == 0 )
-                               return '<span title="' . htmlspecialchars($str). '">' .
-                                       htmlspecialchars( trim( $show ) ) . '</span>';
+                       if ( strcmp ( $str, $value) == 0 ) {
+                               return htmlspecialchars( trim( $show ) );
+                       }
                }
 
                return $str;
@@ -1161,6 +1873,17 @@ class Language {
                return $this->mConverter->parserConvert( $text, $parser );
        }
 
+       # Check if this is a language with variants
+       function hasVariants(){
+               return sizeof($this->getVariants())>1;
+       }
+
+       # Put custom tags (e.g. -{ }-) around math to prevent conversion
+       function armourMath($text){ 
+               return $this->mConverter->armourMath($text);
+       }
+
+
        /**
         * Perform output conversion on a string, and encode for safe HTML output.
         * @param string $text
@@ -1205,6 +1928,17 @@ class Language {
                $this->mConverter->findVariantLink($link, $nt);
        }
 
+       /**
+        * If a language supports multiple variants, converts text
+        * into an array of all possible variants of the text:
+        *  'variant' => text in that variant
+        */
+
+       function convertLinkToAllVariants($text){
+               return $this->mConverter->convertLinkToAllVariants($text);
+       }
+
+
        /**
         * returns language specific options used by User::getPageRenderHash()
         * for example, the preferred language variant
@@ -1234,8 +1968,8 @@ class Language {
         * @param string $text text to be tagged for no conversion
         * @return string the tagged text
        */
-       function markNoConversion( $text ) {
-               return $this->mConverter->markNoConversion( $text );
+       function markNoConversion( $text, $noParse=false ) {
+               return $this->mConverter->markNoConversion( $text, $noParse );
        }
 
        /**
@@ -1269,6 +2003,16 @@ class Language {
                return $prefix . str_replace( '-', '_', ucfirst( $code ) ) . $suffix;
        }
 
+       static function getMessagesFileName( $code ) {
+               global $IP;
+               return self::getFileName( "$IP/languages/messages/Messages", $code, '.php' );
+       }
+
+       static function getClassFileName( $code ) {
+               global $IP;
+               return self::getFileName( "$IP/languages/classes/Language", $code, '.php' );
+       }
+       
        static function getLocalisationArray( $code, $disableCache = false ) {
                self::loadLocalisation( $code, $disableCache );
                return self::$mLocalisationCache[$code];
@@ -1281,7 +2025,7 @@ class Language {
         */
        static function loadLocalisation( $code, $disableCache = false ) {
                static $recursionGuard = array();
-               global $wgMemc, $wgDBname, $IP;
+               global $wgMemc, $wgCheckSerialized;
 
                if ( !$code ) {
                        throw new MWException( "Invalid language code requested" );
@@ -1298,31 +2042,28 @@ class Language {
                        # Try the serialized directory
                        $cache = wfGetPrecompiledData( self::getFileName( "Messages", $code, '.ser' ) );
                        if ( $cache ) {
-                               self::$mLocalisationCache[$code] = $cache;
-                               wfDebug( "Got localisation for $code from precompiled data file\n" );
-                               wfProfileOut( __METHOD__ );
-                               return self::$mLocalisationCache[$code]['deps'];
+                               if ( $wgCheckSerialized && self::isLocalisationOutOfDate( $cache ) ) {
+                                       $cache = false;
+                                       wfDebug( "Language::loadLocalisation(): precompiled data file for $code is out of date\n" );
+                               } else {
+                                       self::$mLocalisationCache[$code] = $cache;
+                                       wfDebug( "Language::loadLocalisation(): got localisation for $code from precompiled data file\n" );
+                                       wfProfileOut( __METHOD__ );
+                                       return self::$mLocalisationCache[$code]['deps'];
+                               }
                        }
 
                        # Try the global cache
-                       $memcKey = "$wgDBname:localisation:$code";
+                       $memcKey = wfMemcKey('localisation', $code );
                        $cache = $wgMemc->get( $memcKey );
                        if ( $cache ) {
-                               $expired = false;
-                               # Check file modification times
-                               foreach ( $cache['deps'] as $file => $mtime ) {
-                                       if ( filemtime( $file ) > $mtime ) {
-                                               $expired = true;
-                                               break;
-                                       }
-                               }
                                if ( self::isLocalisationOutOfDate( $cache ) ) {
                                        $wgMemc->delete( $memcKey );
                                        $cache = false;
-                                       wfDebug( "Localisation cache for $code had expired due to update of $file\n" );
+                                       wfDebug( "Language::loadLocalisation(): localisation cache for $code had expired\n" );
                                } else {
                                        self::$mLocalisationCache[$code] = $cache;
-                                       wfDebug( "Got localisation for $code from cache\n" );
+                                       wfDebug( "Language::loadLocalisation(): got localisation for $code from cache\n" );
                                        wfProfileOut( __METHOD__ );
                                        return $cache['deps'];
                                }
@@ -1331,33 +2072,33 @@ class Language {
                        wfProfileIn( __METHOD__ );
                }
 
+               # Default fallback, may be overridden when the messages file is included
                if ( $code != 'en' ) {
                        $fallback = 'en';
                } else {
                        $fallback = false;
                }
-               
+
                # Load the primary localisation from the source file
-               global $IP;
-               $filename = self::getFileName( "$IP/languages/Messages", $code, '.php' );
+               $filename = self::getMessagesFileName( $code );
                if ( !file_exists( $filename ) ) {
-                       wfDebug( "No localisation file for $code, using implicit fallback to en\n" );
+                       wfDebug( "Language::loadLocalisation(): no localisation file for $code, using implicit fallback to en\n" );
                        $cache = array();
                        $deps = array();
                } else {
                        $deps = array( $filename => filemtime( $filename ) );
                        require( $filename );
                        $cache = compact( self::$mLocalisationKeys );   
-                       wfDebug( "Got localisation for $code from source\n" );
+                       wfDebug( "Language::loadLocalisation(): got localisation for $code from source\n" );
                }
-               
+
                if ( !empty( $fallback ) ) {
                        # Load the fallback localisation, with a circular reference guard
                        if ( isset( $recursionGuard[$code] ) ) {
                                throw new MWException( "Error: Circular fallback reference in language code $code" );
                        }
                        $recursionGuard[$code] = true;
-                       $newDeps = self::loadLocalisation( $fallback );
+                       $newDeps = self::loadLocalisation( $fallback, $disableCache );
                        unset( $recursionGuard[$code] );
 
                        $secondary = self::$mLocalisationCache[$fallback];
@@ -1371,6 +2112,8 @@ class Language {
                                                        $cache[$key] = $cache[$key] + $secondary[$key];
                                                } elseif ( in_array( $key, self::$mMergeableListKeys ) ) {
                                                        $cache[$key] = array_merge( $secondary[$key], $cache[$key] );
+                                               } elseif ( in_array( $key, self::$mMergeableAliasListKeys ) ) {
+                                                       $cache[$key] = array_merge_recursive( $cache[$key], $secondary[$key] );
                                                }
                                        }
                                } else {
@@ -1390,6 +2133,16 @@ class Language {
                # Add dependencies to the cache entry
                $cache['deps'] = $deps;
 
+               # Replace spaces with underscores in namespace names
+               $cache['namespaceNames'] = str_replace( ' ', '_', $cache['namespaceNames'] );
+
+               # And do the same for specialpage aliases. $page is an array.
+               foreach ( $cache['specialPageAliases'] as &$page ) {
+                       $page = str_replace( ' ', '_', $page );
+               }
+               # Decouple the reference to prevent accidental damage
+               unset($page);
+               
                # Save to both caches
                self::$mLocalisationCache[$code] = $cache;
                if ( !$disableCache ) {
@@ -1415,7 +2168,7 @@ class Language {
                }
                $expired = false;
                foreach ( $cache['deps'] as $file => $mtime ) {
-                       if ( filemtime( $file ) > $mtime ) {
+                       if ( !file_exists( $file ) || filemtime( $file ) > $mtime ) {
                                $expired = true;
                                break;
                        }
@@ -1439,6 +2192,14 @@ class Language {
                return self::$mLocalisationCache[$code]['messages'];
        }
 
+       /** 
+        * Get a message for a given language
+        */
+       static function getMessageFor( $key, $code ) {
+               self::loadLocalisation( $code );
+               return isset( self::$mLocalisationCache[$code]['messages'][$key] ) ? self::$mLocalisationCache[$code]['messages'][$key] : null;
+       }
+
        /**
         * Load localisation data for this object
         */
@@ -1459,7 +2220,7 @@ class Language {
         * Do any necessary post-cache-load settings adjustment
         */
        function fixUpSettings() {
-               global $wgExtraNamespaces, $wgMetaNamespace, $wgMetaNamespaceTalk, $wgMessageCache, 
+               global $wgExtraNamespaces, $wgMetaNamespace, $wgMetaNamespaceTalk,
                        $wgNamespaceAliases, $wgAmericanDates;
                wfProfileIn( __METHOD__ );
                if ( $wgExtraNamespaces ) {
@@ -1518,7 +2279,6 @@ class Language {
 
        static function getCaseMaps() {
                static $wikiUpperChars, $wikiLowerChars;
-               global $IP;
                if ( isset( $wikiUpperChars ) ) {
                        return array( $wikiUpperChars, $wikiLowerChars );
                }
@@ -1533,6 +2293,70 @@ class Language {
                wfProfileOut( __METHOD__ );
                return array( $wikiUpperChars, $wikiLowerChars );
        }
-}
 
-?>
+       function formatTimePeriod( $seconds ) {
+               if ( $seconds < 10 ) {
+                       return $this->formatNum( sprintf( "%.1f", $seconds ) ) . wfMsg( 'seconds-abbrev' );
+               } elseif ( $seconds < 60 ) {
+                       return $this->formatNum( round( $seconds ) ) . wfMsg( 'seconds-abbrev' );
+               } elseif ( $seconds < 3600 ) {
+                       return $this->formatNum( floor( $seconds / 60 ) ) . wfMsg( 'minutes-abbrev' ) . 
+                               $this->formatNum( round( fmod( $seconds, 60 ) ) ) . wfMsg( 'seconds-abbrev' );
+               } else {
+                       $hours = floor( $seconds / 3600 );
+                       $minutes = floor( ( $seconds - $hours * 3600 ) / 60 );
+                       $secondsPart = round( $seconds - $hours * 3600 - $minutes * 60 );
+                       return $this->formatNum( $hours ) . wfMsg( 'hours-abbrev' ) . 
+                               $this->formatNum( $minutes ) . wfMsg( 'minutes-abbrev' ) .
+                               $this->formatNum( $secondsPart ) . wfMsg( 'seconds-abbrev' );
+               }
+       }
+
+       function formatBitrate( $bps ) {
+               $units = array( 'bps', 'kbps', 'Mbps', 'Gbps' );
+               if ( $bps <= 0 ) {
+                       return $this->formatNum( $bps ) . $units[0];
+               }
+               $unitIndex = floor( log10( $bps ) / 3 );
+               $mantissa = $bps / pow( 1000, $unitIndex );
+               if ( $mantissa < 10 ) {
+                       $mantissa = round( $mantissa, 1 );
+               } else {
+                       $mantissa = round( $mantissa );
+               }
+               return $this->formatNum( $mantissa ) . $units[$unitIndex];
+       }
+
+       /**
+        * Format a size in bytes for output, using an appropriate
+        * unit (B, KB, MB or GB) according to the magnitude in question
+        *
+        * @param $size Size to format
+        * @return string Plain text (not HTML)
+        */
+       function formatSize( $size ) {
+               // For small sizes no decimal places necessary
+               $round = 0;
+               if( $size > 1024 ) {
+                       $size = $size / 1024;
+                       if( $size > 1024 ) {
+                               $size = $size / 1024;
+                               // For MB and bigger two decimal places are smarter
+                               $round = 2;
+                               if( $size > 1024 ) {
+                                       $size = $size / 1024;
+                                       $msg = 'size-gigabytes';
+                               } else {
+                                       $msg = 'size-megabytes';
+                               }
+                       } else {
+                               $msg = 'size-kilobytes';
+                       }
+               } else {
+                       $msg = 'size-bytes';
+               }
+               $size = round( $size, $round );
+               $text = $this->getMessageFromDB( $msg );
+               return str_replace( '$1', $this->formatNum( $size ), $text );
+       }
+}