var $mVariants, $mCode, $mLoaded = false;
var $mMagicExtensions = array(), $mMagicHookDone = false;
+ private $mHtmlCode = null;
var $mNamespaceIds, $namespaceNames, $namespaceAliases;
var $dateFormatStrings = array();
}
/**
- * Get language names, indexed by code.
+ * Get native language names, indexed by code.
+ * Only those defined in MediaWiki, no other data like CLDR.
* If $customisedOnly is true, only returns codes with a messages file
*
* @param $customisedOnly bool
return $allNames;
}
- global $IP;
$names = array();
// We do this using a foreach over the codes instead of a directory
// loop so that messages files in extensions will work correctly.
}
/**
+ * Get the native language name of $code.
+ * Only if defined in MediaWiki, no other data like CLDR.
* @param $code string
* @return string
*/
* xij j (day number) in Iranian calendar
* xiF F (month name) in Iranian calendar
* xin n (month number) in Iranian calendar
+ * xiy y (two digit year) in Iranian calendar
* xiY Y (full year) in Iranian calendar
*
* xjj j (day number) in Hebrew calendar
if ( !$unix ) {
$unix = wfTimestamp( TS_UNIX, $ts );
}
- $num = date( 'o', $unix );
+ $num = gmdate( 'o', $unix );
break;
case 'Y':
$num = substr( $ts, 0, 4 );
case 'y':
$num = substr( $ts, 2, 2 );
break;
+ case 'xiy':
+ if ( !$iranian ) {
+ $iranian = self::tsToIranian( $ts );
+ }
+ $num = substr( $iranian[0], -2 );
+ break;
case 'a':
$s .= intval( substr( $ts, 8, 2 ) ) < 12 ? 'am' : 'pm';
break;
* get user timecorrection setting)
* @return int
*/
- function userAdjust( $ts, $tz = false ) {
+ function userAdjust( $ts, $tz = false ) {
global $wgUser, $wgLocalTZoffset;
if ( $tz === false ) {
* - true: use user's preference
* - false: use default preference
* - string: format to use
+ * @since 1.19
* @return String
*/
private function internalUserTimeAndDate( $type, $ts, User $user, array $options ) {
* - true: use user's preference
* - false: use default preference
* - string: format to use
+ * @since 1.19
* @return String
*/
public function userDate( $ts, User $user, array $options = array() ) {
* - true: use user's preference
* - false: use default preference
* - string: format to use
+ * @since 1.19
* @return String
*/
public function userTime( $ts, User $user, array $options = array() ) {
* - true: use user's preference
* - false: use default preference
* - string: format to use
+ * @since 1.19
* @return String
*/
public function userTimeAndDate( $ts, User $user, array $options = array() ) {
* @param $nocommafy Bool: set to true for special numbers like dates
* @return string
*/
- function formatNum( $number, $nocommafy = false ) {
+ public function formatNum( $number, $nocommafy = false ) {
global $wgTranslateNumerals;
if ( !$nocommafy ) {
$number = $this->commafy( $number );
*/
function commafy( $_ ) {
$digitGroupingPattern = $this->digitGroupingPattern();
+ if ( $_ === null ) {
+ return '';
+ }
if ( !$digitGroupingPattern || $digitGroupingPattern === "###,###,###" ) {
// default grouping is at thousands, use the same for ###,###,### pattern too.
if ( intval( $_ ) < 0 ) {
// For negative numbers apply the algorithm like positive number and add sign.
$sign = "-";
- $_ = substr( $_,1 );
+ $_ = substr( $_, 1 );
}
$numberpart = array();
$decimalpart = array();
* @return string
*/
function commaList( array $list ) {
- return implode(
+ return implode(
wfMsgExt(
'comma-separator',
array( 'parsemag', 'escapenoentities', 'language' => $this )
* @return string
*/
function semicolonList( array $list ) {
- return implode(
+ return implode(
wfMsgExt(
'semicolon-separator',
array( 'parsemag', 'escapenoentities', 'language' => $this )
* @return string
*/
function pipeList( array $list ) {
- return implode(
+ return implode(
wfMsgExt(
'pipe-separator',
array( 'escapenoentities', 'language' => $this )
* @param $text String
* @return String
*/
- function segmentForDiff( $text ) {
+ public function segmentForDiff( $text ) {
return $text;
}
* @param $text String
* @return String
*/
- function unsegmentForDiff( $text ) {
+ public function unsegmentForDiff( $text ) {
return $text;
}
* Return the LanguageConverter used in the Language
* @return LanguageConverter
*/
- function getConverter() {
+ public function getConverter() {
return $this->mConverter;
}
* @param $text string
* @return array
*/
- function autoConvertToAllVariants( $text ) {
+ public function autoConvertToAllVariants( $text ) {
return $this->mConverter->autoConvertToAllVariants( $text );
}
* @param $text string
* @return string
*/
- function convert( $text ) {
+ public function convert( $text ) {
return $this->mConverter->convert( $text );
}
-
/**
* Convert a Title object to a string in the preferred variant
*
* @param $title Title
* @return string
*/
- function convertTitle( $title ) {
+ public function convertTitle( $title ) {
return $this->mConverter->convertTitle( $title );
}
*
* @return bool
*/
- function hasVariants() {
+ public function hasVariants() {
return sizeof( $this->getVariants() ) > 1;
}
/**
* Check if the language has the specific variant
+ * @param $variant string
* @return bool
*/
- function hasVariant( $variant ) {
+ public function hasVariant( $variant ) {
return (bool)$this->mConverter->validateVariant( $variant );
}
* @param $text string
* @return string
*/
- function armourMath( $text ) {
+ public function armourMath( $text ) {
return $this->mConverter->armourMath( $text );
}
* @return string
* @todo this should get integrated somewhere sane
*/
- function convertHtml( $text, $isTitle = false ) {
+ public function convertHtml( $text, $isTitle = false ) {
return htmlspecialchars( $this->convert( $text, $isTitle ) );
}
* @param $key string
* @return string
*/
- function convertCategoryKey( $key ) {
+ public function convertCategoryKey( $key ) {
return $this->mConverter->convertCategoryKey( $key );
}
*
* @return array an array of language codes
*/
- function getVariants() {
+ public function getVariants() {
return $this->mConverter->getVariants();
}
/**
* @return string
*/
- function getPreferredVariant() {
+ public function getPreferredVariant() {
return $this->mConverter->getPreferredVariant();
}
/**
* @return string
*/
- function getDefaultVariant() {
+ public function getDefaultVariant() {
return $this->mConverter->getDefaultVariant();
}
/**
* @return string
*/
- function getURLVariant() {
+ public function getURLVariant() {
return $this->mConverter->getURLVariant();
}
* we need to transclude a template or update a category's link
* @return null the input parameters may be modified upon return
*/
- function findVariantLink( &$link, &$nt, $ignoreOtherCond = false ) {
+ public function findVariantLink( &$link, &$nt, $ignoreOtherCond = false ) {
$this->mConverter->findVariantLink( $link, $nt, $ignoreOtherCond );
}
*
* @return string
*/
- function convertLinkToAllVariants( $text ) {
+ public function convertLinkToAllVariants( $text ) {
return $this->mConverter->convertLinkToAllVariants( $text );
}
*
* @return string
*/
- function getParsedTitle() {
+ public function getParsedTitle() {
return $this->mConverter->getParsedTitle();
}
* @param $noParse bool
* @return string the tagged text
*/
- function markNoConversion( $text, $noParse = false ) {
+ public function markNoConversion( $text, $noParse = false ) {
return $this->mConverter->markNoConversion( $text, $noParse );
}
*
* @return string
*/
- function linkTrail() {
+ public function linkTrail() {
return self::$dataCache->getItem( $this->mCode, 'linkTrail' );
}
*
* @return string
*/
- function getCode() {
+ public function getCode() {
return $this->mCode;
}
/**
* Get the code in Bcp47 format which we can use
* inside of html lang="" tags.
+ * @since 1.19
+ * @return string
*/
- function getHtmlCode() {
- return wfBcp47( $this->getCode() );
+ public function getHtmlCode() {
+ if ( is_null( $this->mHtmlCode ) ) {
+ $this->mHtmlCode = wfBCP47( $this->getCode() );
+ }
+ return $this->mHtmlCode;
}
/**
* @param $code string
*/
- function setCode( $code ) {
+ public function setCode( $code ) {
$this->mCode = $code;
+ // Ensure we don't leave an incorrect html code lying around
+ $this->mHtmlCode = null;
}
/**
* @param $suffix string Append this to the filename
* @return string $prefix . $mangledCode . $suffix
*/
- static function getFileName( $prefix = 'Language', $code, $suffix = '.php' ) {
+ public static function getFileName( $prefix = 'Language', $code, $suffix = '.php' ) {
// Protect against path traversal
if ( !Language::isValidCode( $code )
|| strcspn( $code, ":/\\\000" ) !== strlen( $code ) )
* @param $suffix string Suffix after the language code
* @return string Language code, or false if $prefix or $suffix isn't found
*/
- static function getCodeFromFileName( $filename, $prefix = 'Language', $suffix = '.php' ) {
+ public static function getCodeFromFileName( $filename, $prefix = 'Language', $suffix = '.php' ) {
$m = null;
preg_match( '/' . preg_quote( $prefix, '/' ) . '([A-Z][a-z_]+)' .
preg_quote( $suffix, '/' ) . '/', $filename, $m );
* @param $code string
* @return string
*/
- static function getMessagesFileName( $code ) {
+ public static function getMessagesFileName( $code ) {
global $IP;
$file = self::getFileName( "$IP/languages/messages/Messages", $code, '.php' );
wfRunHooks( 'Language::getMessagesFileName', array( $code, &$file ) );
* @param $code string
* @return string
*/
- static function getClassFileName( $code ) {
+ public static function getClassFileName( $code ) {
global $IP;
return self::getFileName( "$IP/languages/classes/Language", $code, '.php' );
}
*
* @return false|string
*/
- static function getFallbackFor( $code ) {
+ public static function getFallbackFor( $code ) {
if ( $code === 'en' || !Language::isValidBuiltInCode( $code ) ) {
return false;
} else {
* @param $code string Language code
* @return array
*/
- static function getFallbacksFor( $code ) {
+ public static function getFallbacksFor( $code ) {
if ( $code === 'en' || !Language::isValidBuiltInCode( $code ) ) {
return array();
} else {
*
* @return array
*/
- static function getMessagesFor( $code ) {
+ public static function getMessagesFor( $code ) {
return self::getLocalisationCache()->getItem( $code, 'messages' );
}
*
* @return string
*/
- static function getMessageFor( $key, $code ) {
+ public static function getMessageFor( $key, $code ) {
return self::getLocalisationCache()->getSubitem( $code, 'messages', $key );
}
* @param $code string Language code
* @return array of message keys (strings)
*/
- static function getMessageKeysFor( $code ) {
+ public static function getMessageKeysFor( $code ) {
return self::getLocalisationCache()->getSubItemList( $code, 'messages' );
}
}
/**
+ * Format a bitrate for output, using an appropriate
+ * unit (bps, kbps, Mbps, Gbps, Tbps, Pbps, Ebps, Zbps or Ybps) according to the magnitude in question
+ *
* @param $bps int
* @return string
*/
function formatBitrate( $bps ) {
- $units = array( 'bps', 'kbps', 'Mbps', 'Gbps' );
+ $units = array( '', 'kilo', 'mega', 'giga', 'tera', 'peta', 'exa', 'zeta', 'yotta' );
if ( $bps <= 0 ) {
- return $this->formatNum( $bps ) . $units[0];
+ return str_replace( '$1', $this->formatNum( $bps ), $this->getMessageFromDB( 'bitrate-bits' ) );
}
$unitIndex = (int)floor( log10( $bps ) / 3 );
$mantissa = $bps / pow( 1000, $unitIndex );
+
+ $maxIndex = count( $units ) - 1;
+
+ if ( $unitIndex > $maxIndex ) {
+ // Prevent code falling off end of $units array
+ $mantissa *= ( $unitIndex - $maxIndex ) * 1000;
+ $unitIndex = $maxIndex;
+ }
if ( $mantissa < 10 ) {
$mantissa = round( $mantissa, 1 );
} else {
$mantissa = round( $mantissa );
}
- return $this->formatNum( $mantissa ) . $units[$unitIndex];
+ $msg = "bitrate-{$units[$unitIndex]}bits";
+ $text = $this->getMessageFromDB( $msg );
+ return str_replace( '$1', $this->formatNum( $mantissa ), $text );
}
/**
* Format a size in bytes for output, using an appropriate
- * unit (B, KB, MB or GB) according to the magnitude in question
+ * unit (B, KB, MB, GB, TB, PB, EB, ZB or YB) according to the magnitude in question
*
* @param $size int Size to format
* @return string Plain text (not HTML)
*/
function formatSize( $size ) {
+ $sizes = array( '', 'kilo', 'mega', 'giga', 'tera', 'peta', 'exa', 'zeta', 'yotta' );
+ $index = 0;
+
+ $maxIndex = count( $sizes ) - 1;
+ while ( $size >= 1024 && $index < $maxIndex ) {
+ $index++;
+ $size /= 1024;
+ }
+
// For small sizes no decimal places necessary
$round = 0;
- if ( $size > 1024 ) {
- $size = $size / 1024;
- if ( $size > 1024 ) {
- $size = $size / 1024;
- // For MB and bigger two decimal places are smarter
- $round = 2;
- if ( $size > 1024 ) {
- $size = $size / 1024;
- $msg = 'size-gigabytes';
- } else {
- $msg = 'size-megabytes';
- }
- } else {
- $msg = 'size-kilobytes';
- }
- } else {
- $msg = 'size-bytes';
+ if ( $index > 1 ) {
+ // For MB and bigger two decimal places are smarter
+ $round = 2;
}
+ $msg = "size-{$sizes[$index]}bytes";
+
$size = round( $size, $round );
$text = $this->getMessageFromDB( $msg );
return str_replace( '$1', $this->formatNum( $size ), $text );
# Make 'previous' link
$prev = wfMessage( 'prevn' )->inLanguage( $this )->title( $title )->numParams( $limit )->text();
- if( $offset > 0 ) {
+ if ( $offset > 0 ) {
$plink = $this->numLink( $title, max( $offset - $limit, 0 ), $limit,
$query, $prev, 'prevn-title', 'mw-prevlink' );
} else {
# Make 'next' link
$next = wfMessage( 'nextn' )->inLanguage( $this )->title( $title )->numParams( $limit )->text();
- if( $atend ) {
+ if ( $atend ) {
$nlink = htmlspecialchars( $next );
} else {
$nlink = $this->numLink( $title, $offset + $limit, $limit,
# Make links to set number of items per page
$numLinks = array();
- foreach( array( 20, 50, 100, 250, 500 ) as $num ) {
+ foreach ( array( 20, 50, 100, 250, 500 ) as $num ) {
$numLinks[] = $this->numLink( $title, $offset, $num,
$query, $this->formatNum( $num ), 'shown-title', 'mw-numlink' );
}
*
* @return string
*/
- function getConvRuleTitle() {
+ public function getConvRuleTitle() {
return $this->mConverter->getConvRuleTitle();
}
}
dépôts / lhc / web / wiklou.git / blobdiff