diff options
Diffstat (limited to 'languages/Language.php')
-rw-r--r-- | languages/Language.php | 1075 |
1 files changed, 485 insertions, 590 deletions
diff --git a/languages/Language.php b/languages/Language.php index 8853aced..343ac8a7 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -34,11 +34,13 @@ if( function_exists( 'mb_strtoupper' ) ) { */ class FakeConverter { var $mLang; - function FakeConverter($langobj) {$this->mLang = $langobj;} - function convert($t, $i) {return $t;} - function parserConvert($t, $p) {return $t;} + function FakeConverter( $langobj ) { $this->mLang = $langobj; } + function autoConvertToAllVariants( $text ) { return $text; } + function convert( $t ) { return $t; } + function convertTitle( $t ) { return $t->getPrefixedText(); } function getVariants() { return array( $this->mLang->getCode() ); } - function getPreferredVariant() {return $this->mLang->getCode(); } + function getPreferredVariant() { return $this->mLang->getCode(); } + function getConvRuleTitle() { return false; } function findVariantLink(&$l, &$n, $ignoreOtherCond = false) {} function getExtraHashOptions() {return '';} function getParsedTitle() {return '';} @@ -56,24 +58,16 @@ 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' ); + var $mNamespaceIds, $namespaceNames, $namespaceAliases; + var $dateFormatStrings = array(); + var $mExtendedSpecialPageAliases; - static public $mMergeableAliasListKeys = array( 'specialPageAliases' ); + /** + * ReplacementArray object caches + */ + var $transformData = array(); - static public $mLocalisationCache = array(); + static public $dataCache; static public $mLangObjCache = array(); static public $mWeekdayMsgs = array( @@ -122,7 +116,7 @@ class Language { 'hebrew-calendar-m10-gen', 'hebrew-calendar-m11-gen', 'hebrew-calendar-m12-gen', 'hebrew-calendar-m6a-gen', 'hebrew-calendar-m6b-gen' ); - + static public $mHijriCalendarMonthMsgs = array( 'hijri-calendar-m1', 'hijri-calendar-m2', 'hijri-calendar-m3', 'hijri-calendar-m4', 'hijri-calendar-m5', 'hijri-calendar-m6', @@ -165,7 +159,7 @@ class Language { if ( $recursionLevel > 5 ) { throw new MWException( "Language fallback loop detected when creating class $class\n" ); - } + } if( ! class_exists( $class ) ) { $fallback = Language::getFallbackFor( $code ); @@ -179,6 +173,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 @@ -187,6 +193,7 @@ class Language { } else { $this->mCode = str_replace( '_', '-', strtolower( substr( get_class( $this ), 8 ) ) ); } + self::getLocalisationCache(); } /** @@ -214,7 +221,11 @@ class Language { } function getFallbackLanguageCode() { - return self::getFallbackFor( $this->mCode ); + if ( $this->mCode === 'en' ) { + return false; + } else { + return self::$dataCache->getItem( $this->mCode, 'fallback' ); + } } /** @@ -222,15 +233,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; } @@ -286,11 +316,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. @@ -299,10 +372,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; } /** @@ -334,48 +409,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 ) { @@ -392,17 +460,14 @@ class Language { if ( !$customisedOnly ) { return $allNames; } - + global $IP; $names = array(); $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( $allNames[$code] ) ) { - $names[$code] = $allNames[$code]; - } + $code = self::getCodeFromFileName( $file, 'Messages' ); + if ( $code && isset( $allNames[$code] ) ) { + $names[$code] = $allNames[$code]; } } closedir( $dir ); @@ -458,11 +523,11 @@ class Language { function getHebrewCalendarMonthNameGen( $key ) { return $this->getMessageFromDB( self::$mHebrewCalendarMonthGenMsgs[$key-1] ); } - + function getHijriCalendarMonthName( $key ) { return $this->getMessageFromDB( self::$mHijriCalendarMonthMsgs[$key-1] ); } - + /** * Used by date() and time() to adjust the time output. * @@ -514,7 +579,7 @@ class Language { wfSuppressWarnings(); // E_STRICT system time bitching # Generate an adjusted date; take advantage of the fact that mktime - # will normalize out-of-range values so we don't have to split $minDiff + # will normalize out-of-range values so we don't have to split $minDiff # into hours and minutes. $t = mktime( ( (int)substr( $ts, 8, 2) ), # Hours @@ -523,19 +588,19 @@ class Language { (int)substr( $ts, 4, 2 ), # Month (int)substr( $ts, 6, 2 ), # Day (int)substr( $ts, 0, 4 ) ); #Year - + $date = date( 'YmdHis', $t ); wfRestoreWarnings(); - + return $date; } /** * This is a workalike of PHP's date() function, but with better - * internationalisation, a reduced set of format characters, and a better + * internationalisation, a reduced set of format characters, and a better * escaping format. * - * Supported format characters are dDjlNwzWFmMntLoYyaAgGhHiscrU. See the + * Supported format characters are dDjlNwzWFmMntLoYyaAgGhHiscrU. See the * PHP manual for definitions. "o" format character is supported since * PHP 5.1.0, previous versions return literal o. * There are a number of extensions, which start with "x": @@ -566,6 +631,11 @@ class Language { * * xkY Y (full year) in Thai solar calendar. Months and days are * identical to the Gregorian calendar + * xoY Y (full year) in Minguo calendar or Juche year. + * Months and days are identical to the + * Gregorian calendar + * xtY Y (full year) in Japanese nengo. 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 @@ -578,7 +648,7 @@ class Language { * * Input timestamp is assumed to be pre-normalized to the desired local * time zone, if any. - * + * * @param $format String * @param $ts String: 14-character timestamp * YYYYMMDDHHMMSS @@ -597,6 +667,8 @@ class Language { $hebrew = false; $hijri = false; $thai = false; + $minguo = false; + $tenno = false; for ( $p = 0; $p < strlen( $format ); $p++ ) { $num = false; $code = $format[$p]; @@ -604,7 +676,7 @@ class Language { $code .= $format[++$p]; } - if ( ( $code === 'xi' || $code == 'xj' || $code == 'xk' || $code == 'xm' ) && $p < strlen( $format ) - 1 ) { + if ( ( $code === 'xi' || $code == 'xj' || $code == 'xk' || $code == 'xm' || $code == 'xo' || $code == 'xt' ) && $p < strlen( $format ) - 1 ) { $code .= $format[++$p]; } @@ -748,9 +820,17 @@ class Language { $num = $hebrew[0]; break; case 'xkY': - if ( !$thai ) $thai = self::tsToThai( $ts ); + if ( !$thai ) $thai = self::tsToYear( $ts, 'thai' ); $num = $thai[0]; break; + case 'xoY': + if ( !$minguo ) $minguo = self::tsToYear( $ts, 'minguo' ); + $num = $minguo[0]; + break; + case 'xtY': + if ( !$tenno ) $tenno = self::tsToYear( $ts, 'tenno' ); + $num = $tenno[0]; + break; case 'y': $num = substr( $ts, 2, 2 ); break; @@ -770,7 +850,7 @@ class Language { case 'h': $h = substr( $ts, 8, 2 ); $num = sprintf( '%02d', $h % 12 ? $h % 12 : 12 ); - break; + break; case 'H': $num = substr( $ts, 8, 2 ); break; @@ -841,11 +921,11 @@ class Language { 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 + * 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 ) { @@ -872,7 +952,7 @@ class Language { // Days passed in current month $gDayNo += $gd; - + $jDayNo = $gDayNo - 79; $jNp = floor($jDayNo / 12053); @@ -906,7 +986,7 @@ class Language { $year = substr( $ts, 0, 4 ); $month = substr( $ts, 4, 2 ); $day = substr( $ts, 6, 2 ); - + $zyr = $year; $zd=$day; $zm=$month; @@ -916,15 +996,15 @@ class Language { if (($zy>1582)||(($zy==1582)&&($zm>10))||(($zy==1582)&&($zm==10)&&($zd>14))) { - - + + $zjd=(int)((1461*($zy + 4800 + (int)( ($zm-14) /12) ))/4) + (int)((367*($zm-2-12*((int)(($zm-14)/12))))/12)-(int)((3*(int)(( ($zy+4900+(int)(($zm-14)/12))/100)))/4)+$zd-32075; } else { $zjd = 367*$zy-(int)((7*($zy+5001+(int)(($zm-9)/7)))/4)+(int)((275*$zm)/9)+$zd+1729777; } - + $zl=$zjd-1948440+10632; $zn=(int)(($zl-1)/10631); $zl=$zl-10631*$zn+354; @@ -1112,26 +1192,72 @@ class Language { } /** - * Algorithm to convert Gregorian dates to Thai solar dates. + * Algorithm to convert Gregorian dates to Thai solar dates, + * Minguo dates or Minguo dates. * * Link: http://en.wikipedia.org/wiki/Thai_solar_calendar + * http://en.wikipedia.org/wiki/Minguo_calendar + * http://en.wikipedia.org/wiki/Japanese_era_name * - * @param $ts String: 14-character timestamp + * @param $ts String: 14-character timestamp, calender name * @return array converted year, month, day */ - private static function tsToThai( $ts ) { + private static function tsToYear( $ts, $cName ) { $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; + if (!strcmp($cName,'thai')) { + # Thai solar dates + # Add 543 years to the Gregorian calendar + # Months and days are identical + $gy_offset = $gy + 543; + } else if ((!strcmp($cName,'minguo')) || !strcmp($cName,'juche')) { + # Minguo dates + # Deduct 1911 years from the Gregorian calendar + # Months and days are identical + $gy_offset = $gy - 1911; + } else if (!strcmp($cName,'tenno')) { + # Nengō dates up to Meiji period + # Deduct years from the Gregorian calendar + # depending on the nengo periods + # Months and days are identical + 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; + if ($gy_gannen == 1) + $gy_offset = '元'; + $gy_offset = '昭和'.$gy_offset; + } else { + # Heisei period + $gy_gannen = $gy - 1989 + 1; + $gy_offset = $gy_gannen; + if ($gy_gannen == 1) + $gy_offset = '元'; + $gy_offset = '平成'.$gy_offset; + } + } else { + $gy_offset = $gy; + } - return array( $gy_thai, $gm, $gd ); + return array( $gy_offset, $gm, $gd ); } - /** * Roman number formatting up to 3000 */ @@ -1142,7 +1268,7 @@ class Language { array( '', 'C', 'CC', 'CCC', 'CD', 'D', 'DC', 'DCC', 'DCCC', 'CM', 'M' ), array( '', 'M', 'MM', 'MMM' ) ); - + $num = intval( $num ); if ( $num > 3000 || $num <= 0 ) { return $num; @@ -1252,11 +1378,33 @@ class Language { if( $datePreference == '' ) { return 'default'; } - + 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) * @param $adj Bool: whether to adjust the time output according to the @@ -1267,16 +1415,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; + if ( $adj ) { + $ts = $this->userAdjust( $ts, $timecorrection ); } - return $this->sprintfDate( $this->dateFormats["$pref date"], $ts ); + $df = $this->getDateFormatString( 'date', $this->dateFormat( $format ) ); + return $this->sprintfDate( $df, $ts ); } /** @@ -1290,16 +1433,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; + if ( $adj ) { + $ts = $this->userAdjust( $ts, $timecorrection ); } - return $this->sprintfDate( $this->dateFormats["$pref time"], $ts ); + $df = $this->getDateFormatString( 'time', $this->dateFormat( $format ) ); + return $this->sprintfDate( $df, $ts ); } /** @@ -1314,69 +1452,74 @@ 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; + if ( $adj ) { + $ts = $this->userAdjust( $ts, $timecorrection ); } - - 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() 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 ) { - 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 ) { @@ -1404,15 +1547,19 @@ 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 ) { @@ -1455,7 +1602,7 @@ class Language { array($this,"ucwordsCallbackMB"), $str ); - else + else return preg_replace_callback( $replaceRegexp, array($this,"ucwordsCallbackWiki"), @@ -1483,7 +1630,7 @@ class Language { array($this,"ucwordbreaksCallbackMB"), $str ); - else + else return preg_replace_callback( $replaceRegexp, array($this,"ucwordsCallbackWiki"), @@ -1500,7 +1647,7 @@ class Language { /** * Return a case-folded representation of $s * - * This is a representation such that caseFold($s1)==caseFold($s2) if $s1 + * 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. * @@ -1528,89 +1675,55 @@ 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; } /** - * Some languages have special punctuation to strip out - * or characters which need to be converted for MySQL's - * indexing to grok it correctly. Make such changes here. - * + * Some languages such as Chinese require word segmentation, + * Specify such segmentation when overridden in derived class. + * * @param $string String * @return String */ - function stripForSearch( $string ) { - global $wgDBtype; - if ( $wgDBtype != 'mysql' ) { - return $string; - } - - - wfProfileIn( __METHOD__ ); - - // MySQL fulltext index doesn't grok utf-8, so we - // need to fold cases and convert to hex - $out = preg_replace_callback( - "/([\\xc0-\\xff][\\x80-\\xbf]*)/", - array( $this, 'stripForSearchCallback' ), - $this->lc( $string ) ); - - // And to add insult to injury, the default indexing - // ignores short words... Pad them so we can pass them - // through without reconfiguring the server... - $minLength = $this->minSearchLength(); - if( $minLength > 1 ) { - $n = $minLength-1; - $out = preg_replace( - "/\b(\w{1,$n})\b/", - "$1u800", - $out ); - } - - // Periods within things like hostnames and IP addresses - // are also important -- we want a search for "example.com" - // or "192.168.1.1" to work sanely. - // - // MySQL's search seems to ignore them, so you'd match on - // "example.wikipedia.com" and "192.168.83.1" as well. - $out = preg_replace( - "/(\w)\.(\w|\*)/u", - "$1u82e$2", - $out ); - - wfProfileOut( __METHOD__ ); - return $out; + function wordSegmentation( $string ) { + return $string; } - + /** - * Armor a case-folded UTF-8 string to get through MySQL's - * fulltext search without being mucked up by funny charset - * settings or anything else of the sort. + * Some languages have special punctuation need to be normalized. + * Make such changes here. + * + * @param $string String + * @return String */ - protected function stripForSearchCallback( $matches ) { - return 'u8' . bin2hex( $matches[1] ); + function normalizeForSearch( $string ) { + return $string; } - + /** - * Check MySQL server's ft_min_word_len setting so we know - * if we need to pad short words... - */ - protected function minSearchLength() { - if( !isset( $this->minSearchLength ) ) { - $sql = "show global variables like 'ft\\_min\\_word\\_len'"; - $dbr = wfGetDB( DB_SLAVE ); - $result = $dbr->query( $sql ); - $row = $result->fetchObject(); - $result->free(); - - if( $row && $row->Variable_name == 'ft_min_word_len' ) { - $this->minSearchLength = intval( $row->Value ); - } else { - $this->minSearchLength = 0; - } - } - return $this->minSearchLength; + * convert double-width roman characters to single-width. + * range: ff00-ff5f ~= 0020-007f + */ + protected static function convertDoubleWidth( $string ) { + $string = preg_replace( '/\xef\xbc([\x80-\xbf])/e', 'chr((ord("$1") & 0x3f) + 0x20)', $string ); + $string = preg_replace( '/\xef\xbd([\x80-\x99])/e', 'chr((ord("$1") & 0x3f) + 0x60)', $string ); + return $string; + } + + protected static function insertSpace( $string, $pattern ) { + $string = preg_replace( $pattern, " $1 ", $string ); + $string = preg_replace( '/ +/', ' ', $string ); + return $string; } function convertForSearchResult( $termsArray ) { @@ -1620,7 +1733,7 @@ class Language { } /** - * Get the first character of a string. + * Get the first character of a string. * * @param $s string * @return string @@ -1634,7 +1747,7 @@ class Language { if ( strlen( $matches[1] ) != 3 ) { return $matches[1]; } - + // Break down Hangul syllables to grab the first jamo $code = utf8ToCodepoint( $matches[1] ); if ( $code < 0xac00 || 0xd7a4 <= $code) { @@ -1712,13 +1825,74 @@ class Language { } /** + * Convert a UTF-8 string to normal form C. In Malayalam and Arabic, this + * also cleans up certain backwards-compatible sequences, converting them + * to the modern Unicode equivalent. + * + * This is language-specific for performance reasons only. + */ + function normalize( $s ) { + return UtfNormal::cleanUp( $s ); + } + + /** + * Transform a string using serialized data stored in the given file (which + * must be in the serialized subdirectory of $IP). The file contains pairs + * mapping source characters to destination characters. + * + * The data is cached in process memory. This will go faster if you have the + * FastStringSearch extension. + */ + function transformUsingPairFile( $file, $string ) { + if ( !isset( $this->transformData[$file] ) ) { + $data = wfGetPrecompiledData( $file ); + if ( $data === false ) { + throw new MWException( __METHOD__.": The transformation file $file is missing" ); + } + $this->transformData[$file] = new ReplacementArray( $data ); + } + return $this->transformData[$file]->replace( $string ); + } + + /** * For right-to-left language support * * @return bool */ - function isRTL() { - $this->load(); - return $this->rtl; + function isRTL() { + 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'; } /** @@ -1730,6 +1904,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 * @@ -1745,34 +1923,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; } } @@ -1810,43 +1983,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() ) ); } @@ -1855,20 +1996,6 @@ class Language { } /** - * 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 * * @param $text String: the text to be emphasized. @@ -1940,13 +2067,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' ); } @@ -1987,7 +2112,7 @@ class Language { function commaList( $list ) { return implode( $list, - wfMsgExt( 'comma-separator', array( 'escapenoentities', 'language' => $this ) ) ); + wfMsgExt( 'comma-separator', array( 'parsemag', 'escapenoentities', 'language' => $this ) ) ); } /** @@ -1999,7 +2124,7 @@ class Language { function semicolonList( $list ) { return implode( $list, - wfMsgExt( 'semicolon-separator', array( 'escapenoentities', 'language' => $this ) ) ); + wfMsgExt( 'semicolon-separator', array( 'parsemag', 'escapenoentities', 'language' => $this ) ) ); } /** @@ -2022,7 +2147,7 @@ class Language { * 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 to truncate * @param $length Int: maximum length (excluding ellipses) * @param $ellipsis String to append to the truncated text @@ -2040,6 +2165,7 @@ class Language { if ( strlen( $string ) <= abs( $length ) ) { return $string; } + $stringOriginal = $string; if( $length > 0 ) { $string = substr( $string, 0, $length ); $char = ord( $string[strlen( $string ) - 1] ); @@ -2053,7 +2179,8 @@ class Language { # We chopped in the middle of a character; remove it $string = $m[1]; } - return $string . $ellipsis; + $string = $string . $ellipsis; + } else { $string = substr( $string, $length ); $char = ord( $string[0] ); @@ -2061,7 +2188,13 @@ class Language { # We chopped in the middle of a character; remove the whole thing $string = preg_replace( '/^[\x80-\xbf]+/', '', $string ); } - return $ellipsis . $string; + $string = $ellipsis . $string; + } + # Do not truncate if the ellipsis actually make the string longer. Bug 22181 + if ( strlen( $string ) < strlen( $stringOriginal ) ) { + return $string; + } else { + return $stringOriginal; } } @@ -2181,14 +2314,19 @@ 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) { - return $this->mConverter->convert($text, $isTitle); + function convert( $text ) { + return $this->mConverter->convert( $text ); } - # Convert text from within Parser - function parserConvert( $text, &$parser ) { - return $this->mConverter->parserConvert( $text, $parser ); + # Convert a Title object to a string in the preferred variant + function convertTitle( $title ) { + return $this->mConverter->convertTitle( $title ); } # Check if this is a language with variants @@ -2197,15 +2335,15 @@ class Language { } # Put custom tags (e.g. -{ }-) around math to prevent conversion - function armourMath($text){ + function armourMath($text){ return $this->mConverter->armourMath($text); } /** * 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 */ @@ -2228,8 +2366,8 @@ class Language { } - function getPreferredVariant( $fromUser = true ) { - return $this->mConverter->getPreferredVariant( $fromUser ); + function getPreferredVariant( $fromUser = true, $fromHeader = false ) { + return $this->mConverter->getPreferredVariant( $fromUser, $fromHeader ); } /** @@ -2298,8 +2436,7 @@ class Language { * @return string */ function linkTrail() { - $this->load(); - return $this->linkTrail; + return self::$dataCache->getItem( $this->mCode, 'linkTrail' ); } function getLangObj() { @@ -2317,10 +2454,34 @@ class Language { $this->mCode = $code; } + /** + * Get the name of a file for a certain language code + * @param $prefix string Prepend this to the filename + * @param $code string Language code + * @param $suffix string Append this to the filename + * @return string $prefix . $mangledCode . $suffix + */ static function getFileName( $prefix = 'Language', $code, $suffix = '.php' ) { return $prefix . str_replace( '-', '_', ucfirst( $code ) ) . $suffix; } + /** + * Get the language code from a file name. Inverse of getFileName() + * @param $filename string $prefix . $languageCode . $suffix + * @param $prefix string Prefix before the language code + * @param $suffix string Suffix after the language code + * @return Language code, or false if $prefix or $suffix isn't found + */ + static function getCodeFromFileName( $filename, $prefix = 'Language', $suffix = '.php' ) { + $m = null; + preg_match( '/' . preg_quote( $prefix, '/' ) . '([A-Z][a-z_]+)' . + preg_quote( $suffix, '/' ) . '/', $filename, $m ); + if ( !count( $m ) ) { + return false; + } + return str_replace( '_', '-', strtolower( $m[1] ) ); + } + static function getMessagesFileName( $code ) { global $IP; return self::getFileName( "$IP/languages/messages/Messages", $code, '.php' ); @@ -2330,305 +2491,32 @@ class Language { 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]; - } - - /** - * 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']; - } - } - } - - # 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 ) { @@ -2638,10 +2526,10 @@ class Language { $talk = str_replace( '$1', $wgMetaNamespace, $talk ); # Allow grammar transformations - # Allowing full message-style parsing would make simple requests - # such as action=raw much more expensive than they need to be. + # Allowing full message-style parsing would make simple requests + # such as action=raw much more expensive than they need to be. # This will hopefully cover most cases. - $talk = preg_replace_callback( '/{{grammar:(.*?)\|(.*?)}}/i', + $talk = preg_replace_callback( '/{{grammar:(.*?)\|(.*?)}}/i', array( &$this, 'replaceGrammarInNamespace' ), $talk ); return str_replace( ' ', '_', $talk ); } @@ -2659,7 +2547,7 @@ class Language { wfProfileIn( __METHOD__ ); $arr = wfGetPrecompiledData( 'Utf8Case.ser' ); if ( $arr === false ) { - throw new MWException( + throw new MWException( "Utf8Case.ser is missing, please run \"make\" in the serialized directory\n" ); } extract( $arr ); @@ -2673,13 +2561,13 @@ class Language { } elseif ( $seconds < 60 ) { return $this->formatNum( round( $seconds ) ) . wfMsg( 'seconds-abbrev' ); } elseif ( $seconds < 3600 ) { - return $this->formatNum( floor( $seconds / 60 ) ) . wfMsg( 'minutes-abbrev' ) . + 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' ) . + return $this->formatNum( $hours ) . wfMsg( 'hours-abbrev' ) . $this->formatNum( $minutes ) . wfMsg( 'minutes-abbrev' ) . $this->formatNum( $secondsPart ) . wfMsg( 'seconds-abbrev' ); } @@ -2732,4 +2620,11 @@ class Language { $text = $this->getMessageFromDB( $msg ); return str_replace( '$1', $this->formatNum( $size ), $text ); } + + /** + * Get the conversion rule title, if any. + */ + function getConvRuleTitle() { + return $this->mConverter->getConvRuleTitle(); + } } |