* @since 1.20
* @var array
*/
- static public $languagesWithVariants = array(
+ static public $languagesWithVariants = [
'gan',
'iu',
'kk',
'tg',
'uz',
'zh',
- );
+ ];
public $mMainLanguageCode;
public $mVariants, $mVariantFallbacks, $mVariantNames;
* @param array $flags Defining the custom strings that maps to the flags
* @param array $manualLevel Limit for supported variants
*/
- public function __construct( $langobj, $maincode, $variants = array(),
- $variantfallbacks = array(), $flags = array(),
- $manualLevel = array() ) {
+ public function __construct( $langobj, $maincode, $variants = [],
+ $variantfallbacks = [], $flags = [],
+ $manualLevel = [] ) {
global $wgDisabledVariants;
$this->mLangObj = $langobj;
$this->mMainLanguageCode = $maincode;
$this->mVariantFallbacks = $variantfallbacks;
$this->mVariantNames = Language::fetchLanguageNames();
$this->mCacheKey = wfMemcKey( 'conversiontables', $maincode );
- $defaultflags = array(
+ $defaultflags = [
// 'S' show converted text
// '+' add rules for alltext
// 'E' the gave flags is error
'-' => '-', // remove convert (not implement)
'H' => 'H', // add rule for convert code (but no display in placed code)
'N' => 'N' // current variant name
- );
+ ];
$this->mFlags = array_merge( $defaultflags, $flags );
foreach ( $this->mVariants as $v ) {
if ( array_key_exists( $v, $manualLevel ) ) {
$req = $this->getURLVariant();
- if ( $wgUser->isLoggedIn() && !$req ) {
+ if ( $wgUser->isSafeToLoad() && $wgUser->isLoggedIn() && !$req ) {
$req = $this->getUserVariant();
} elseif ( !$req ) {
$req = $this->getHeaderVariant();
// Get language variant preference from logged in users
// Don't call this on stub objects because that causes infinite
// recursion during initialisation
+ if ( !$wgUser->isSafeToLoad() ) {
+ return false;
+ }
if ( $wgUser->isLoggedIn() ) {
if ( $this->mMainLanguageCode == $wgContLang->getCode() ) {
$ret = $wgUser->getOption( 'variant' );
return null;
}
- $fallbackLanguages = array();
+ $fallbackLanguages = [];
foreach ( $languages as $language ) {
$this->mHeaderVariant = $this->validateVariant( $language );
if ( $this->mHeaderVariant ) {
) {
$attrs = Sanitizer::decodeTagAttributes( $elementMatches[2] );
$changed = false;
- foreach ( array( 'title', 'alt' ) as $attrName ) {
+ foreach ( [ 'title', 'alt' ] as $attrName ) {
if ( !isset( $attrs[$attrName] ) ) {
continue;
}
public function autoConvertToAllVariants( $text ) {
$this->loadTables();
- $ret = array();
+ $ret = [];
foreach ( $this->mVariants as $variant ) {
$ret[$variant] = $this->translate( $text, $variant );
}
* @return string Namespace name for display
*/
public function convertNamespace( $index, $variant = null ) {
+ if ( $index === NS_MAIN ) {
+ return '';
+ }
+
if ( $variant === null ) {
$variant = $this->getPreferredVariant();
}
- if ( $index === NS_MAIN ) {
- return '';
- } else {
- // First check if a message gives a converted name in the target variant.
- $nsConvMsg = wfMessage( 'conversion-ns' . $index )->inLanguage( $variant );
- if ( $nsConvMsg->exists() ) {
- return $nsConvMsg->plain();
- }
- // Then check if a message gives a converted name in content language
- // which needs extra translation to the target variant.
+
+ $cache = ObjectCache::newAccelerator( CACHE_NONE );
+ $key = wfMemcKey( 'languageconverter', 'namespace-text', $index, $variant );
+ $nsVariantText = $cache->get( $key );
+ if ( $nsVariantText !== false ) {
+ return $nsVariantText;
+ }
+
+ // First check if a message gives a converted name in the target variant.
+ $nsConvMsg = wfMessage( 'conversion-ns' . $index )->inLanguage( $variant );
+ if ( $nsConvMsg->exists() ) {
+ $nsVariantText = $nsConvMsg->plain();
+ }
+
+ // Then check if a message gives a converted name in content language
+ // which needs extra translation to the target variant.
+ if ( $nsVariantText === false ) {
$nsConvMsg = wfMessage( 'conversion-ns' . $index )->inContentLanguage();
if ( $nsConvMsg->exists() ) {
- return $this->translate( $nsConvMsg->plain(), $variant );
+ $nsVariantText = $this->translate( $nsConvMsg->plain(), $variant );
}
+ }
+
+ if ( $nsVariantText === false ) {
// No message exists, retrieve it from the target variant's namespace names.
$langObj = $this->mLangObj->factory( $variant );
- return $langObj->getFormattedNsText( $index );
+ $nsVariantText = $langObj->getFormattedNsText( $index );
}
+
+ $cache->set( $key, $nsVariantText, 60 );
+
+ return $nsVariantText;
}
/**
return;
}
- $titles = array();
+ $titles = [];
foreach ( $variants as $v ) {
if ( $v != $link ) {
* @return array
*/
function parseCachedTable( $code, $subpage = '', $recursive = true ) {
- static $parsed = array();
+ static $parsed = [];
$key = 'Conversiontable/' . $code;
if ( $subpage ) {
$key .= '/' . $subpage;
}
if ( array_key_exists( $key, $parsed ) ) {
- return array();
+ return [];
}
$parsed[$key] = true;
# Nothing to parse if there's no text
if ( $txt === false || $txt === null || $txt === '' ) {
- return array();
+ return [];
}
// get all subpage links of the form
$linkhead = $this->mLangObj->getNsText( NS_MEDIAWIKI ) .
':Conversiontable';
$subs = StringUtils::explode( '[[', $txt );
- $sublinks = array();
+ $sublinks = [];
foreach ( $subs as $sub ) {
$link = explode( ']]', $sub, 2 );
if ( count( $link ) != 2 ) {
// parse the mappings in this page
$blocks = StringUtils::explode( '-{', $txt );
- $ret = array();
+ $ret = [];
$first = true;
foreach ( $blocks as $block ) {
if ( $first ) {
$first = false;
continue;
}
- $mappings = explode( '}-', $block, 2 );
- $stripped = str_replace( array( "'", '"', '*', '#' ), '', $mappings[0] );
+ $mappings = explode( '}-', $block, 2 )[0];
+ $stripped = str_replace( [ "'", '"', '*', '#' ], '', $mappings );
$table = StringUtils::explode( ';', $stripped );
foreach ( $table as $t ) {
$m = explode( '=>', $t, 3 );
}
/**
- * Hook to refresh the cache of conversion tables when
+ * Refresh the cache of conversion tables when
* MediaWiki:Conversiontable* is updated.
- * @private
*
- * @param WikiPage $page
- * @param User $user User object for the current user
- * @param Content $content New page content
- * @param string $summary Edit summary of the edit
- * @param bool $isMinor Was the edit marked as minor?
- * @param null $isWatch Unused.
- * @param null $section Unused.
- * @param int $flags Bitfield
- * @param Revision|null $revision New Revision object or null
- * @return bool True
+ * @param Title $titleobj The Title of the page being updated
*/
- function OnPageContentSaveComplete( $page, $user, $content, $summary, $isMinor,
- $isWatch, $section, $flags, $revision ) {
- $titleobj = $page->getTitle();
+ public function updateConversionTable( Title $titleobj ) {
if ( $titleobj->getNamespace() == NS_MEDIAWIKI ) {
$title = $titleobj->getDBkey();
$t = explode( '/', $title, 3 );
}
}
}
- return true;
- }
-
- /**
- * Armour rendered math against conversion.
- * Escape special chars in parsed math text. (in most cases are img elements)
- *
- * @param string $text Text to armour against conversion
- * @return string Armoured text where { and } have been converted to
- * { and }
- * @deprecated since 1.22 is no longer used
- */
- public function armourMath( $text ) {
- // convert '-{' and '}-' to '-{' and '}-' to prevent
- // any unwanted markup appearing in the math image tag.
- $text = strtr( $text, array( '-{' => '-{', '}-' => '}-' ) );
- return $text;
}
/**
// text should be splited by ";" only if a valid variant
// name exist after the markup, for example:
// -{zh-hans:<span style="font-size:120%;">xxx</span>;zh-hant:\
- // <span style="font-size:120%;">yyy</span>;}-
+ // <span style="font-size:120%;">yyy</span>;}-
// we should split it as:
// array(
- // [0] => 'zh-hans:<span style="font-size:120%;">xxx</span>'
- // [1] => 'zh-hant:<span style="font-size:120%;">yyy</span>'
- // [2] => ''
- // )
+ // [0] => 'zh-hans:<span style="font-size:120%;">xxx</span>'
+ // [1] => 'zh-hant:<span style="font-size:120%;">yyy</span>'
+ // [2] => ''
+ // )
$pat = '/;\s*(?=';
foreach ( $this->mVariants as $variant ) {
// zh-hans:xxx;zh-hant:yyy
dépôts / lhc / web / wiklou.git / blobdiff