Partial revert of r56693 related to reverts in r56937: use old values for 'userlogin'
[lhc/web/wiklou.git] / languages / Language.php
index c54b56d..32f9e8a 100644 (file)
@@ -35,7 +35,8 @@ if( function_exists( 'mb_strtoupper' ) ) {
 class FakeConverter {
        var $mLang;
        function FakeConverter($langobj) {$this->mLang = $langobj;}
-       function convert($t, $i, $v) {return $t;}
+       function autoConvertToAllVariants($text) {return $text;}
+       function convert($t, $i) {return $t;}
        function parserConvert($t, $p) {return $t;}
        function getVariants() { return array( $this->mLang->getCode() ); }
        function getPreferredVariant() {return $this->mLang->getCode(); }
@@ -46,7 +47,6 @@ class FakeConverter {
        function convertCategoryKey( $key ) {return $key; }
        function convertLinkToAllVariants($text){ return array( $this->mLang->getCode() => $text); }
        function armourMath($text){ return $text; }
-       function groupConvert($group) {return '';}
 }
 
 /**
@@ -57,24 +57,12 @@ class Language {
        var $mConverter, $mVariants, $mCode, $mLoaded = false;
        var $mMagicExtensions = array(), $mMagicHookDone = false;
 
-       static public $mLocalisationKeys = array(
-               'fallback', 'namespaceNames', 'mathNames', 'bookstoreList',
-               'magicWords', 'messages', 'rtl', 'digitTransformTable',
-               'separatorTransformTable', 'fallback8bitEncoding', 'linkPrefixExtension',
-               'defaultUserOptionOverrides', 'linkTrail', 'namespaceAliases',
-               'dateFormats', 'datePreferences', 'datePreferenceMigrationMap',
-               'defaultDateFormat', 'extraUserToggles', 'specialPageAliases',
-               'imageFiles'
-       );
-
-       static public $mMergeableMapKeys = array( 'messages', 'namespaceNames', 'mathNames',
-               'dateFormats', 'defaultUserOptionOverrides', 'magicWords', 'imageFiles' );
-
-       static public $mMergeableListKeys = array( 'extraUserToggles' );
-
-       static public $mMergeableAliasListKeys = array( 'specialPageAliases' );
+       var $mNamespaceIds, $namespaceNames, $namespaceAliases;
+       var $dateFormatStrings = array();
+       var $minSearchLength;
+       var $mExtendedSpecialPageAliases;
 
-       static public $mLocalisationCache = array();
+       static public $dataCache;
        static public $mLangObjCache = array();
 
        static public $mWeekdayMsgs = array(
@@ -180,6 +168,18 @@ class Language {
                return $lang;
        }
 
+       /**
+        * Get the LocalisationCache instance
+        */
+       public static function getLocalisationCache() {
+               if ( is_null( self::$dataCache ) ) {
+                       global $wgLocalisationCacheConf;
+                       $class = $wgLocalisationCacheConf['class'];
+                       self::$dataCache = new $class( $wgLocalisationCacheConf );
+               }
+               return self::$dataCache;
+       }
+
        function __construct() {
                $this->mConverter = new FakeConverter($this);
                // Set the code to the name of the descendant
@@ -188,6 +188,7 @@ class Language {
                } else {
                        $this->mCode = str_replace( '_', '-', strtolower( substr( get_class( $this ), 8 ) ) );
                }
+               self::getLocalisationCache();
        }
 
        /**
@@ -215,7 +216,11 @@ class Language {
        }
 
        function getFallbackLanguageCode() {
-               return self::getFallbackFor( $this->mCode );
+               if ( $this->mCode === 'en' ) {
+                       return false;
+               } else {
+                       return self::$dataCache->getItem( $this->mCode, 'fallback' );
+               }
        }
 
        /**
@@ -223,15 +228,34 @@ class Language {
         * @return array
         */
        function getBookstoreList() {
-               $this->load();
-               return $this->bookstoreList;
+               return self::$dataCache->getItem( $this->mCode, 'bookstoreList' );
        }
 
        /**
         * @return array
         */
        function getNamespaces() {
-               $this->load();
+               if ( is_null( $this->namespaceNames ) ) {
+                       global $wgExtraNamespaces, $wgMetaNamespace, $wgMetaNamespaceTalk;
+                       
+                       $this->namespaceNames = self::$dataCache->getItem( $this->mCode, 'namespaceNames' );
+                       if ( $wgExtraNamespaces ) {
+                               $this->namespaceNames = $wgExtraNamespaces + $this->namespaceNames;
+                       }
+
+                       $this->namespaceNames[NS_PROJECT] = $wgMetaNamespace;
+                       if ( $wgMetaNamespaceTalk ) {
+                               $this->namespaceNames[NS_PROJECT_TALK] = $wgMetaNamespaceTalk;
+                       } else {
+                               $talk = $this->namespaceNames[NS_PROJECT_TALK];
+                               $this->namespaceNames[NS_PROJECT_TALK] =
+                                       $this->fixVariableInNamespace( $talk );
+                       }
+                       
+                       # The above mixing may leave namespaces out of canonical order.
+                       # Re-order by namespace ID number...
+                       ksort( $this->namespaceNames );
+               }
                return $this->namespaceNames;
        }
 
@@ -287,11 +311,54 @@ class Language {
         * @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;
+               $ids = $this->getNamespaceIds();
+               return isset( $ids[$lctext] ) ? $ids[$lctext] : false;
+       }
+
+       function getNamespaceAliases() {
+               if ( is_null( $this->namespaceAliases ) ) {
+                       $aliases = self::$dataCache->getItem( $this->mCode, 'namespaceAliases' );
+                       if ( !$aliases ) {
+                               $aliases = array();
+                       } else {
+                               foreach ( $aliases as $name => $index ) {
+                                       if ( $index === NS_PROJECT_TALK ) {
+                                               unset( $aliases[$name] );
+                                               $name = $this->fixVariableInNamespace( $name );
+                                               $aliases[$name] = $index;
+                                       }
+                               }
+                       }
+                       $this->namespaceAliases = $aliases;
+               }
+               return $this->namespaceAliases;
        }
 
+       function getNamespaceIds() {
+               if ( is_null( $this->mNamespaceIds ) ) {
+                       global $wgNamespaceAliases;
+                       # Put namespace names and aliases into a hashtable.
+                       # If this is too slow, then we should arrange it so that it is done 
+                       # before caching. The catch is that at pre-cache time, the above
+                       # class-specific fixup hasn't been done.
+                       $this->mNamespaceIds = array();
+                       foreach ( $this->getNamespaces() as $index => $name ) {
+                               $this->mNamespaceIds[$this->lc($name)] = $index;
+                       }
+                       foreach ( $this->getNamespaceAliases() as $name => $index ) {
+                               $this->mNamespaceIds[$this->lc($name)] = $index;
+                       }
+                       if ( $wgNamespaceAliases ) {
+                               foreach ( $wgNamespaceAliases as $name => $index ) {
+                                       $this->mNamespaceIds[$this->lc($name)] = $index;
+                               }
+                       }
+               }
+               return $this->mNamespaceIds;
+       }
+
+
        /**
         * Get a namespace key by value, case insensitive.  Canonical namespace
         * names override custom ones defined for the current language.
@@ -300,10 +367,12 @@ class Language {
         * @return mixed An integer if $text is a valid value otherwise false
         */
        function getNsIndex( $text ) {
-               $this->load();
                $lctext = $this->lc($text);
-               if( ( $ns = MWNamespace::getCanonicalIndex( $lctext ) ) !== null ) return $ns;
-               return isset( $this->mNamespaceIds[$lctext] ) ? $this->mNamespaceIds[$lctext] : false;
+               if ( ( $ns = MWNamespace::getCanonicalIndex( $lctext ) ) !== null ) {
+                       return $ns;
+               }
+               $ids = $this->getNamespaceIds();
+               return isset( $ids[$lctext] ) ? $ids[$lctext] : false;
        }
 
        /**
@@ -335,48 +404,41 @@ class Language {
        }
 
        function getMathNames() {
-               $this->load();
-               return $this->mathNames;
+               return self::$dataCache->getItem( $this->mCode, 'mathNames' );
        }
 
        function getDatePreferences() {
-               $this->load();
-               return $this->datePreferences;
+               return self::$dataCache->getItem( $this->mCode, 'datePreferences' );
        }
        
        function getDateFormats() {
-               $this->load();
-               return $this->dateFormats;
+               return self::$dataCache->getItem( $this->mCode, 'dateFormats' );
        }
 
        function getDefaultDateFormat() {
-               $this->load();
-               return $this->defaultDateFormat;
+               $df = self::$dataCache->getItem( $this->mCode, 'defaultDateFormat' );
+               if ( $df === 'dmy or mdy' ) {
+                       global $wgAmericanDates;
+                       return $wgAmericanDates ? 'mdy' : 'dmy';
+               } else {
+                       return $df;
+               }
        }
 
        function getDatePreferenceMigrationMap() {
-               $this->load();
-               return $this->datePreferenceMigrationMap;
+               return self::$dataCache->getItem( $this->mCode, 'datePreferenceMigrationMap' );
        }
 
        function getImageFile( $image ) {
-               $this->load();
-               return $this->imageFiles[$image];
+               return self::$dataCache->getSubitem( $this->mCode, 'imageFiles', $image );
        }
 
        function getDefaultUserOptionOverrides() {
-               $this->load();
-               # 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();
-               }
+               return self::$dataCache->getItem( $this->mCode, 'defaultUserOptionOverrides' );
        }
 
        function getExtraUserToggles() {
-               $this->load();
-               return $this->extraUserToggles;
+               return self::$dataCache->getItem( $this->mCode, 'extraUserToggles' );
        }
 
        function getUserToggle( $tog ) {
@@ -1154,11 +1216,25 @@ class Language {
                        # Months and days are identical
                        $gy_offset = $gy - 1911;
                } else if (!strcmp($cName,'tenno')) {
-                       # Minguo dates up to Showa period
+                       # Nengō dates up to Meiji period
                        # Deduct years from the Gregorian calendar
                        # depending on the nengo periods
                        # Months and days are identical
-                       if (($gy < 1989) || (($gy == 1989) && ($gm == 1) && ($gd < 8))) {
+                       if (($gy < 1912) || (($gy == 1912) && ($gm < 7)) || (($gy == 1912) && ($gm == 7) && ($gd < 31))) {
+                               # Meiji period
+                               $gy_gannen = $gy - 1868 + 1;
+                               $gy_offset = $gy_gannen;
+                               if ($gy_gannen == 1)
+                                       $gy_offset = '元';
+                               $gy_offset = '明治'.$gy_offset;
+                       } else if ((($gy == 1912) && ($gm == 7) && ($gd == 31)) || (($gy == 1912) && ($gm >= 8)) || (($gy > 1912) && ($gy < 1926)) || (($gy == 1926) && ($gm < 12)) || (($gy == 1926) && ($gm == 12) && ($gd < 26))) {
+                               # Taishō period
+                               $gy_gannen = $gy - 1912 + 1;
+                               $gy_offset = $gy_gannen;
+                               if ($gy_gannen == 1)
+                                       $gy_offset = '元';
+                               $gy_offset = '大正'.$gy_offset;
+                       } else if ((($gy == 1926) && ($gm == 12) && ($gd >= 26)) || (($gy > 1926) && ($gy < 1989)) || (($gy == 1989) && ($gm == 1) && ($gd < 8))) {
                                # Shōwa period
                                $gy_gannen = $gy - 1926 + 1;
                                $gy_offset = $gy_gannen;
@@ -1304,6 +1380,28 @@ class Language {
                return $datePreference;
        }
 
+       /**
+        * Get a format string for a given type and preference
+        * @param $type May be date, time or both
+        * @param $pref The format name as it appears in Messages*.php
+        */
+       function getDateFormatString( $type, $pref ) {
+               if ( !isset( $this->dateFormatStrings[$type][$pref] ) ) {
+                       if ( $pref == 'default' ) {
+                               $pref = $this->getDefaultDateFormat();
+                               $df = self::$dataCache->getSubitem( $this->mCode, 'dateFormats', "$pref $type" );
+                       } else {
+                               $df = self::$dataCache->getSubitem( $this->mCode, 'dateFormats', "$pref $type" );
+                               if ( is_null( $df ) ) {
+                                       $pref = $this->getDefaultDateFormat();
+                                       $df = self::$dataCache->getSubitem( $this->mCode, 'dateFormats', "$pref $type" );
+                               }
+                       }
+                       $this->dateFormatStrings[$type][$pref] = $df;
+               }
+               return $this->dateFormatStrings[$type][$pref];
+       }
+
        /**
         * @param $ts Mixed: the time format which needs to be turned into a
         *            date('YmdHis') format with wfTimestamp(TS_MW,$ts)
@@ -1315,16 +1413,11 @@ class Language {
         * @return string
         */
        function date( $ts, $adj = false, $format = true, $timecorrection = false ) {
-               $this->load();
                if ( $adj ) { 
                        $ts = $this->userAdjust( $ts, $timecorrection ); 
                }
-
-               $pref = $this->dateFormat( $format );
-               if( $pref == 'default' || !isset( $this->dateFormats["$pref date"] ) ) {
-                       $pref = $this->defaultDateFormat;
-               }
-               return $this->sprintfDate( $this->dateFormats["$pref date"], $ts );
+               $df = $this->getDateFormatString( 'date', $this->dateFormat( $format ) );
+               return $this->sprintfDate( $df, $ts );
        }
 
        /**
@@ -1338,16 +1431,11 @@ class Language {
         * @return string
         */
        function time( $ts, $adj = false, $format = true, $timecorrection = false ) {
-               $this->load();
                if ( $adj ) { 
                        $ts = $this->userAdjust( $ts, $timecorrection ); 
                }
-
-               $pref = $this->dateFormat( $format );
-               if( $pref == 'default' || !isset( $this->dateFormats["$pref time"] ) ) {
-                       $pref = $this->defaultDateFormat;
-               }
-               return $this->sprintfDate( $this->dateFormats["$pref time"], $ts );
+               $df = $this->getDateFormatString( 'time', $this->dateFormat( $format ) );
+               return $this->sprintfDate( $df, $ts );
        }
 
        /**
@@ -1362,35 +1450,34 @@ class Language {
         * @return string
         */
        function timeanddate( $ts, $adj = false, $format = true, $timecorrection = false) {
-               $this->load();
-
                $ts = wfTimestamp( TS_MW, $ts );
-
                if ( $adj ) { 
                        $ts = $this->userAdjust( $ts, $timecorrection ); 
                }
-
-               $pref = $this->dateFormat( $format );
-               if( $pref == 'default' || !isset( $this->dateFormats["$pref both"] ) ) {
-                       $pref = $this->defaultDateFormat;
-               }
-
-               return $this->sprintfDate( $this->dateFormats["$pref both"], $ts );
+               $df = $this->getDateFormatString( 'both', $this->dateFormat( $format ) );
+               return $this->sprintfDate( $df, $ts );
        }
 
        function getMessage( $key ) {
-               $this->load();
-               return isset( $this->messages[$key] ) ? $this->messages[$key] : null;
+               return self::$dataCache->getSubitem( $this->mCode, 'messages', $key );
        }
 
        function getAllMessages() {
-               $this->load();
-               return $this->messages;
+               return self::$dataCache->getItem( $this->mCode, 'messages' );
        }
 
        function iconv( $in, $out, $string ) {
-               # For most languages, this is a wrapper for iconv
-               return iconv( $in, $out . '//IGNORE', $string );
+               # This is a wrapper for iconv in all languages except esperanto,
+               # which does some nasty x-conversions beforehand
+
+               # Even with //IGNORE iconv can whine about illegal characters in
+               # *input* string. We just ignore those too.
+               # REF: http://bugs.php.net/bug.php?id=37166
+               # REF: https://bugzilla.wikimedia.org/show_bug.cgi?id=16885
+               wfSuppressWarnings();
+               $text = iconv( $in, $out . '//IGNORE', $string );
+               wfRestoreWarnings();
+               return $text;
        }
 
        // callback functions for uc(), lc(), ucwords(), ucwordbreaks()
@@ -1422,9 +1509,15 @@ class Language {
        }
 
        function ucfirst( $str ) {
-               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
+               $o = ord( $str );
+               if ( $o < 96 ) {
+                       return $str;
+               } elseif ( $o < 128 ) {
+                       return ucfirst($str);
+               } else {
+                       // fall back to more complex logic in case of multibyte strings
+                       return self::uc($str,true); 
+               }
        }
 
        function uc( $str, $first = false ) {
@@ -1454,13 +1547,17 @@ class Language {
        }
        
        function lcfirst( $str ) {
-               if ( empty($str) ) return $str;
-               if ( is_string( $str ) && ord($str[0]) < 128 ) {
-                       // editing string in place = cool
-                       $str[0]=strtolower($str[0]);
+               $o = ord( $str );
+               if ( !$o ) {
+                       return strval( $str );
+               } elseif ( $o >= 128 ) {
+                       return self::lc( $str, true );
+               } elseif ( $o > 96 ) {
+                       return $str;
+               } else {
+                       $str[0] = strtolower( $str[0] );
                        return $str;
                }
-               else return self::lc( $str, true );
        }
 
        function lc( $str, $first = false ) {
@@ -1576,8 +1673,17 @@ class Language {
        }
 
        function fallback8bitEncoding() {
-               $this->load();
-               return $this->fallback8bitEncoding;
+               return self::$dataCache->getItem( $this->mCode, 'fallback8bitEncoding' );
+       }
+       
+       /**
+        * Most writing systems use whitespace to break up words.
+        * Some languages such as Chinese don't conventionally do this,
+        * which requires special handling when breaking up words for
+        * searching etc.
+        */
+       function hasWordBreaks() {
+               return true;
        }
        
        /**
@@ -1645,7 +1751,7 @@ class Language {
         * if we need to pad short words...
         */
        protected function minSearchLength() {
-               if( !isset( $this->minSearchLength ) ) {
+               if( is_null( $this->minSearchLength ) ) {
                        $sql = "show global variables like 'ft\\_min\\_word\\_len'";
                        $dbr = wfGetDB( DB_SLAVE );
                        $result = $dbr->query( $sql );
@@ -1765,8 +1871,39 @@ class Language {
         * @return bool
         */
        function isRTL() { 
-               $this->load();
-               return $this->rtl;
+               return self::$dataCache->getItem( $this->mCode, 'rtl' );
+       }
+       
+       /**
+        * Return the correct HTML 'dir' attribute value for this language.
+        * @return String
+        */
+       function getDir() {
+               return $this->isRTL() ? 'rtl' : 'ltr';
+       }
+       
+       /**
+        * Return 'left' or 'right' as appropriate alignment for line-start
+        * for this language's text direction.
+        *
+        * Should be equivalent to CSS3 'start' text-align value....
+        *
+        * @return String
+        */
+       function alignStart() {
+               return $this->isRTL() ? 'right' : 'left';
+       }
+       
+       /**
+        * Return 'right' or 'left' as appropriate alignment for line-end
+        * for this language's text direction.
+        *
+        * Should be equivalent to CSS3 'end' text-align value....
+        *
+        * @return String
+        */
+       function alignEnd() {
+               return $this->isRTL() ? 'left' : 'right';
        }
 
        /**
@@ -1778,6 +1915,10 @@ class Language {
                return $this->isRTL() ? "\xE2\x80\x8F" : "\xE2\x80\x8E";
        }
 
+       function capitalizeAllNouns() {
+               return self::$dataCache->getItem( $this->mCode, 'capitalizeAllNouns' );
+       }
+
        /**
         * An arrow, depending on the language direction
         *
@@ -1793,34 +1934,29 @@ class Language {
         * @return bool
         */
        function linkPrefixExtension() {
-               $this->load();
-               return $this->linkPrefixExtension;
+               return self::$dataCache->getItem( $this->mCode, 'linkPrefixExtension' );
        }
 
-       function &getMagicWords() {
-               $this->load();
-               return $this->magicWords;
+       function getMagicWords() {
+               return self::$dataCache->getItem( $this->mCode, 'magicWords' );
        }
 
        # Fill a MagicWord object with data from here
-       function getMagic( &$mw ) {
+       function getMagic( $mw ) {
                if ( !$this->mMagicHookDone ) {
                        $this->mMagicHookDone = true;
+                       wfProfileIn( 'LanguageGetMagic' );
                        wfRunHooks( 'LanguageGetMagic', array( &$this->mMagicExtensions, $this->getCode() ) );
+                       wfProfileOut( 'LanguageGetMagic' );
                }
                if ( isset( $this->mMagicExtensions[$mw->mId] ) ) {
                        $rawEntry = $this->mMagicExtensions[$mw->mId];
                } else {
-                       $magicWords =& $this->getMagicWords();
+                       $magicWords = $this->getMagicWords();
                        if ( isset( $magicWords[$mw->mId] ) ) {
                                $rawEntry = $magicWords[$mw->mId];
                        } else {
-                               # Fall back to English if local list is incomplete
-                               $magicWords =& Language::getMagicWords();
-                               if ( !isset($magicWords[$mw->mId]) ) {
-                                       throw new MWException("Magic word '{$mw->mId}' not found" ); 
-                               }
-                               $rawEntry = $magicWords[$mw->mId];
+                               $rawEntry = false;
                        }
                }
 
@@ -1858,43 +1994,11 @@ class Language {
         *   case folded alias => real name
         */
        function getSpecialPageAliases() {
-               $this->load();
-
                // Cache aliases because it may be slow to load them
-               if ( !isset( $this->mExtendedSpecialPageAliases ) ) {
-
+               if ( is_null( $this->mExtendedSpecialPageAliases ) ) {
                        // Initialise array
-                       $this->mExtendedSpecialPageAliases = $this->specialPageAliases;
-
-                       global $wgExtensionAliasesFiles;
-                       foreach ( $wgExtensionAliasesFiles as $file ) {
-
-                               // Fail fast
-                               if ( !file_exists($file) )
-                                       throw new MWException( "Aliases file does not exist: $file" );
-
-                               $aliases = array();
-                               require($file);
-
-                               // Check the availability of aliases
-                               if ( !isset($aliases['en']) )
-                                       throw new MWException( "Malformed aliases file: $file" );
-
-                               // Merge all aliases in fallback chain
-                               $code = $this->getCode();
-                               do {
-                                       if ( !isset($aliases[$code]) ) continue;
-
-                                       $aliases[$code] = $this->fixSpecialPageAliases( $aliases[$code] );
-                                       /* Merge the aliases, THIS will break if there is special page name
-                                       * which looks like a numerical key, thanks to PHP...
-                                       * See the array_merge_recursive manual entry */
-                                       $this->mExtendedSpecialPageAliases = array_merge_recursive(
-                                               $this->mExtendedSpecialPageAliases, $aliases[$code] );
-
-                               } while ( $code = self::getFallbackFor( $code ) );
-                       }
-
+                       $this->mExtendedSpecialPageAliases = 
+                               self::$dataCache->getItem( $this->mCode, 'specialPageAliases' );
                        wfRunHooks( 'LanguageGetSpecialPageAliases',
                                array( &$this->mExtendedSpecialPageAliases, $this->getCode() ) );
                }
@@ -1902,20 +2006,6 @@ class Language {
                return $this->mExtendedSpecialPageAliases;
        }
 
-       /**
-        * Function to fix special page aliases. Will convert the first letter to
-        * upper case and spaces to underscores. Can be given a full aliases array,
-        * in which case it will recursively fix all aliases.
-        */
-       public function fixSpecialPageAliases( $mixed ) {
-               // Work recursively until in string level
-               if ( is_array($mixed) ) {
-                       $callback = array( $this, 'fixSpecialPageAliases' );
-                       return array_map( $callback, $mixed );
-               }
-               return str_replace( ' ', '_', $this->ucfirst( $mixed ) );
-       }
-
        /**
         * Italic is unsuitable for some languages
         *
@@ -1988,13 +2078,11 @@ class Language {
        }
 
        function digitTransformTable() {
-               $this->load();
-               return $this->digitTransformTable;
+               return self::$dataCache->getItem( $this->mCode, 'digitTransformTable' );
        }
 
        function separatorTransformTable() {
-               $this->load();
-               return $this->separatorTransformTable;
+               return self::$dataCache->getItem( $this->mCode, 'separatorTransformTable' );
        }
 
 
@@ -2035,7 +2123,7 @@ class Language {
        function commaList( $list ) {
                return implode(
                        $list,
-                       wfMsgExt( 'comma-separator', array( 'escapenoentities', 'language' => $this ) ) );
+                       wfMsgExt( 'comma-separator', array( 'parsemag', 'escapenoentities', 'language' => $this ) ) );
        }
 
        /**
@@ -2047,7 +2135,7 @@ class Language {
        function semicolonList( $list ) {
                return implode(
                        $list,
-                       wfMsgExt( 'semicolon-separator', array( 'escapenoentities', 'language' => $this ) ) );
+                       wfMsgExt( 'semicolon-separator', array( 'parsemag', 'escapenoentities', 'language' => $this ) ) );
        }
 
        /**
@@ -2229,9 +2317,14 @@ class Language {
                return $text;
        }
 
+       # convert text to all supported variants
+       function autoConvertToAllVariants($text) {
+               return $this->mConverter->autoConvertToAllVariants($text);
+       }
+
        # convert text to different variants of a language.
-       function convert( $text, $isTitle = false, $variant = null ) {
-               return $this->mConverter->convert($text, $isTitle, $variant);
+       function convert( $text, $isTitle = false) {
+               return $this->mConverter->convert($text, $isTitle);
        }
 
        # Convert text from within Parser
@@ -2252,8 +2345,8 @@ class Language {
 
        /**
         * Perform output conversion on a string, and encode for safe HTML output.
-        * @param $text String
-        * @param $isTitle Bool -- wtf?
+        * @param $text String text to be converted
+        * @param $isTitle Bool whether this conversion is for the article title
         * @return string
         * @todo this should get integrated somewhere sane
         */
@@ -2338,16 +2431,6 @@ class Language {
        function markNoConversion( $text, $noParse=false ) {
                return $this->mConverter->markNoConversion( $text, $noParse );
        }
-       
-       /**
-        * Callback function for magicword 'groupconvert'
-        *
-        * @param string $group: the group name called for
-        * @return blank string
-        */
-       function groupConvert( $group ) {
-               return $this->mConverter->groupConvert( $group );
-       }
 
        /**
         * A regular expression to match legal word-trailing characters
@@ -2356,8 +2439,7 @@ class Language {
         * @return string
         */
        function linkTrail() {
-               $this->load();
-               return $this->linkTrail;
+               return self::$dataCache->getItem( $this->mCode, 'linkTrail' );
        }
 
        function getLangObj() {
@@ -2389,306 +2471,31 @@ class Language {
                return self::getFileName( "$IP/languages/classes/Language", $code, '.php' );
        }
        
-       static function getLocalisationArray( $code, $disableCache = false ) {
-               self::loadLocalisation( $code, $disableCache );
-               return self::$mLocalisationCache[$code];
-       }
-
-       /**
-        * Load localisation data for a given code into the static cache
-        *
-        * @return array Dependencies, map of filenames to mtimes
-        */
-       static function loadLocalisation( $code, $disableCache = false ) {
-               static $recursionGuard = array();
-               global $wgMemc, $wgEnableSerializedMessages, $wgCheckSerialized;
-
-               if ( !$code ) {
-                       throw new MWException( "Invalid language code requested" );
-               }
-
-               if ( !$disableCache ) {
-                       # Try the per-process cache
-                       if ( isset( self::$mLocalisationCache[$code] ) ) {
-                               return self::$mLocalisationCache[$code]['deps'];
-                       }
-
-                       wfProfileIn( __METHOD__ );
-
-                       # Try the serialized directory
-                       if( $wgEnableSerializedMessages ) {
-                               $cache = wfGetPrecompiledData( self::getFileName( "Messages", $code, '.ser' ) );
-                               if ( $cache ) {
-                                       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'];
-                                       }
-                               }
-                       } else {
-                               $cache = false;
-                       }
-
-                       # Try the global cache
-                       $memcKey = wfMemcKey('localisation', $code );
-                       $fbMemcKey = wfMemcKey('fallback', $cache['fallback'] );
-                       $cache = $wgMemc->get( $memcKey );
-                       if ( $cache ) {
-                               if ( self::isLocalisationOutOfDate( $cache ) ) {
-                                       $wgMemc->delete( $memcKey );
-                                       $wgMemc->delete( $fbMemcKey );
-                                       $cache = false;
-                                       wfDebug( "Language::loadLocalisation(): localisation cache for $code had expired\n" );
-                               } else {
-                                       self::$mLocalisationCache[$code] = $cache;
-                                       wfDebug( "Language::loadLocalisation(): got localisation for $code from cache\n" );
-                                       wfProfileOut( __METHOD__ );
-                                       return $cache['deps'];
-                               }
-                       }
-               } else {
-                       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
-               $filename = self::getMessagesFileName( $code );
-               if ( !file_exists( $filename ) ) {
-                       wfDebug( "Language::loadLocalisation(): no localisation file for $code, using implicit fallback to en\n" );
-                       $cache = compact( self::$mLocalisationKeys ); // Set correct fallback
-                       $deps = array();
-               } else {
-                       $deps = array( $filename => filemtime( $filename ) );
-                       require( $filename );
-                       $cache = compact( self::$mLocalisationKeys );
-                       wfDebug( "Language::loadLocalisation(): got localisation for $code from source\n" );
-               }
-               
-               # Load magic word source file
-               global $IP;
-               $filename = "$IP/includes/MagicWord.php";
-               $newDeps = array( $filename => filemtime( $filename ) );
-               $deps = array_merge( $deps, $newDeps );
-
-               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, $disableCache );
-                       unset( $recursionGuard[$code] );
-
-                       $secondary = self::$mLocalisationCache[$fallback];
-                       $deps = array_merge( $deps, $newDeps );
-
-                       # Merge the fallback localisation with the current localisation
-                       foreach ( self::$mLocalisationKeys as $key ) {
-                               if ( isset( $cache[$key] ) ) {
-                                       if ( isset( $secondary[$key] ) ) {
-                                               if ( in_array( $key, self::$mMergeableMapKeys ) ) {
-                                                       $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 {
-                                       $cache[$key] = $secondary[$key];
-                               }
-                       }
-
-                       # Merge bookstore lists if requested
-                       if ( !empty( $cache['bookstoreList']['inherit'] ) ) {
-                               $cache['bookstoreList'] = array_merge( $cache['bookstoreList'], $secondary['bookstoreList'] );
-                       }
-                       if ( isset( $cache['bookstoreList']['inherit'] ) ) {
-                               unset( $cache['bookstoreList']['inherit'] );
-                       }
-               }
-               
-               # 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 ) {
-                       $wgMemc->set( $memcKey, $cache );
-                       $wgMemc->set( $fbMemcKey, (string) $cache['fallback'] );
-               }
-
-               wfProfileOut( __METHOD__ );
-               return $deps;
-       }
-
-       /**
-        * Test if a given localisation cache is out of date with respect to the 
-        * source Messages files. This is done automatically for the global cache
-        * in $wgMemc, but is only done on certain occasions for the serialized 
-        * data file.
-        *
-        * @param $cache mixed Either a language code or a cache array
-        */
-       static function isLocalisationOutOfDate( $cache ) {
-               if ( !is_array( $cache ) ) {
-                       self::loadLocalisation( $cache );
-                       $cache = self::$mLocalisationCache[$cache];
-               }
-               // At least one language file and the MagicWord file needed
-               if( count($cache['deps']) < 2 ) {
-                       return true;
-               }
-               $expired = false;
-               foreach ( $cache['deps'] as $file => $mtime ) {
-                       if ( !file_exists( $file ) || filemtime( $file ) > $mtime ) {
-                               $expired = true;
-                               break;
-                       }
-               }
-               return $expired;
-       }
-       
        /**
         * Get the fallback for a given language
         */
        static function getFallbackFor( $code ) {
-               // Shortcut
-               if ( $code === 'en' ) return false;
-
-               // Local cache
-               static $cache = array();
-               // Quick return
-               if ( isset($cache[$code]) ) return $cache[$code];
-
-               // Try memcache
-               global $wgMemc;
-               $memcKey = wfMemcKey( 'fallback', $code );
-               $fbcode = $wgMemc->get( $memcKey );
-
-               if ( is_string($fbcode) ) {
-                       // False is stored as a string to detect failures in memcache properly
-                       if ( $fbcode === '' ) $fbcode = false;
-
-                       // Update local cache and return
-                       $cache[$code] = $fbcode;
-                       return $fbcode;
+               if ( $code === 'en' ) {
+                       // Shortcut
+                       return false;
+               } else {
+                       return self::getLocalisationCache()->getItem( $code, 'fallback' );
                }
-
-               // Nothing in caches, load and and update both caches
-               self::loadLocalisation( $code );
-               $fbcode = self::$mLocalisationCache[$code]['fallback'];
-
-               $cache[$code] = $fbcode;
-               $wgMemc->set( $memcKey, (string) $fbcode );
-
-               return $fbcode;
        }
 
        /** 
         * Get all messages for a given language
+        * WARNING: this may take a long time
         */
        static function getMessagesFor( $code ) {
-               self::loadLocalisation( $code );
-               return self::$mLocalisationCache[$code]['messages'];
+               return self::getLocalisationCache()->getItem( $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
-        */
-       function load() {
-               if ( !$this->mLoaded ) {
-                       self::loadLocalisation( $this->getCode() );
-                       $cache =& self::$mLocalisationCache[$this->getCode()];
-                       foreach ( self::$mLocalisationKeys as $key ) {
-                               $this->$key = $cache[$key];
-                       }
-                       $this->mLoaded = true;
-
-                       $this->fixUpSettings();
-               }
-       }
-
-       /**
-        * Do any necessary post-cache-load settings adjustment
-        */
-       function fixUpSettings() {
-               global $wgExtraNamespaces, $wgMetaNamespace, $wgMetaNamespaceTalk,
-                       $wgNamespaceAliases, $wgAmericanDates;
-               wfProfileIn( __METHOD__ );
-               if ( $wgExtraNamespaces ) {
-                       $this->namespaceNames = $wgExtraNamespaces + $this->namespaceNames;
-               }
-
-               $this->namespaceNames[NS_PROJECT] = $wgMetaNamespace;
-               if ( $wgMetaNamespaceTalk ) {
-                       $this->namespaceNames[NS_PROJECT_TALK] = $wgMetaNamespaceTalk;
-               } else {
-                       $talk = $this->namespaceNames[NS_PROJECT_TALK];
-                       $this->namespaceNames[NS_PROJECT_TALK] =
-                               $this->fixVariableInNamespace( $talk );
-               }
-               
-               # The above mixing may leave namespaces out of canonical order.
-               # Re-order by namespace ID number...
-               ksort( $this->namespaceNames );
-
-               # Put namespace names and aliases into a hashtable.
-               # If this is too slow, then we should arrange it so that it is done 
-               # before caching. The catch is that at pre-cache time, the above
-               # class-specific fixup hasn't been done.
-               $this->mNamespaceIds = array();
-               foreach ( $this->namespaceNames as $index => $name ) {
-                       $this->mNamespaceIds[$this->lc($name)] = $index;
-               }
-               if ( $this->namespaceAliases ) {
-                       foreach ( $this->namespaceAliases as $name => $index ) {
-                               if ( $index === NS_PROJECT_TALK ) {
-                                       unset( $this->namespaceAliases[$name] );
-                                       $name = $this->fixVariableInNamespace( $name );
-                                       $this->namespaceAliases[$name] = $index;
-                               }
-                               $this->mNamespaceIds[$this->lc($name)] = $index;
-                       }
-               }
-               if ( $wgNamespaceAliases ) {
-                       foreach ( $wgNamespaceAliases as $name => $index ) {
-                               $this->mNamespaceIds[$this->lc($name)] = $index;
-                       }
-               }
-
-               if ( $this->defaultDateFormat == 'dmy or mdy' ) {
-                       $this->defaultDateFormat = $wgAmericanDates ? 'mdy' : 'dmy';
-               }
-               wfProfileOut( __METHOD__ );
+               return self::getLocalisationCache()->getSubitem( $code, 'messages', $key );
        }
 
        function fixVariableInNamespace( $talk ) {