var $mVariants, $mVariantFallbacks, $mVariantNames;
var $mTablesLoaded = false;
var $mTables;
- var $mManualAddTables;
- var $mManualRemoveTables;
var $mNamespaceTables;
- var $mTitleDisplay='';
var $mDoTitleConvert=true, $mDoContentConvert=true;
var $mManualLevel; // 'bidirectional' 'unidirectional' 'disable' for each variants
var $mTitleFromFlag = false;
var $mFlags;
var $mDescCodeSep = ':',$mDescVarSep = ';';
var $mUcfirst = false;
- var $mGroups = array();
+ var $mTitleOriginal = '';
+ var $mTitleDisplay = '';
const CACHE_VERSION_KEY = 'VERSION 6';
* @param array $manualLevel limit for supported variants
* @public
*/
- function __construct($langobj, $maincode,
+ function __construct( $langobj, $maincode,
$variants=array(),
$variantfallbacks=array(),
$markup=array(),
$manualLevel = array() ) {
$this->mLangObj = $langobj;
$this->mMainLanguageCode = $maincode;
- $this->mVariants = $variants;
+
+ global $wgDisabledVariants;
+ $this->mVariants = array();
+ foreach( $variants as $variant ) {
+ if( !in_array( $variant, $wgDisabledVariants ) )
+ $this->mVariants[] = $variant;
+ }
$this->mVariantFallbacks = $variantfallbacks;
global $wgLanguageNames;
$this->mVariantNames = $wgLanguageNames;
$this->mManualLevel[$v]=array_key_exists($v,$manualLevel)
?$manualLevel[$v]
:'bidirectional';
- $this->mManualAddTables[$v] = array();
- $this->mManualRemoveTables[$v] = array();
$this->mNamespaceTables[$v] = array();
$this->mFlags[$v] = $v;
}
/**
* get preferred language variants.
* @param boolean $fromUser Get it from $wgUser's preferences
+ * @param boolean $fromHeader Get it from Accept-Language
* @return string the preferred language code
* @public
*/
- function getPreferredVariant( $fromUser = true ) {
- global $wgUser, $wgRequest, $wgVariantArticlePath, $wgDefaultLanguageVariant;
+ function getPreferredVariant( $fromUser = true, $fromHeader = false ) {
+ global $wgUser, $wgRequest, $wgVariantArticlePath, $wgDefaultLanguageVariant, $wgOut;
- if($this->mPreferredVariant)
+ // bug 21974, don't return $this->mPreferredVariant if $fromUser = false
+ if( $fromUser && $this->mPreferredVariant )
return $this->mPreferredVariant;
// figure out user lang without constructing wgLang to avoid infinite recursion
}
// see if default variant is globaly set
- if($wgDefaultLanguageVariant != false && in_array( $wgDefaultLanguageVariant, $this->mVariants )){
+ if($wgDefaultLanguageVariant != false && in_array( $wgDefaultLanguageVariant, $this->mVariants )){
$this->mPreferredVariant = $wgDefaultLanguageVariant;
return $this->mPreferredVariant;
}
// http header, but we don't set the mPreferredVariant
// variable in case this is called before the user's
// preference is loaded
- if( array_key_exists( 'HTTP_ACCEPT_LANGUAGE', $_SERVER ) ) {
- $acceptLanguage = str_replace( '_', '-', strtolower($_SERVER["HTTP_ACCEPT_LANGUAGE"]));
-
+ if( $fromHeader && array_key_exists( 'HTTP_ACCEPT_LANGUAGE', $_SERVER ) ) {
+ $acceptLanguage = strtolower( $_SERVER['HTTP_ACCEPT_LANGUAGE'] );
// explode by comma
$result = explode(',', $acceptLanguage);
- $languages = array();
+ $languages = array();
foreach( $result as $elem ) {
// if $elem likes 'zh-cn;q=0.9'
}
}
+ $fallback_languages = array();
foreach( $languages as $language ) {
// strip whitespace
$language = trim( $language );
if( in_array( $language, $this->mVariants ) ) {
return $language;
- break;
+ }
+ else {
+ // To see if there are fallbacks of current language.
+ // We record these fallback variants, and process
+ // them later.
+ $fallbacks = $this->getVariantFallbacks( $language );
+ if( is_string( $fallbacks ) )
+ $fallback_languages[] = $fallbacks;
+ elseif( is_array( $fallbacks ) )
+ $fallback_languages = array_merge( $fallback_languages, $fallbacks );
+ }
+ }
+
+ // process fallback languages now
+ $fallback_languages = array_unique( $fallback_languages );
+ foreach( $fallback_languages as $language ) {
+ if( in_array( $language, $this->mVariants ) ) {
+ return $language;
}
}
}
}
-
return $this->mMainLanguageCode;
-
}
/**
// enable convertsion of '<img alt="xxxx" ... ' or '<span title="xxxx" ... '
$captionpattern = '/\s(title|alt)\s*=\s*"([\s\S]*?)"/';
+
+ $trtext = '';
+ $trtextmark = "\0";
+ $notrtext = array();
foreach($matches as $m) {
$mark = substr($text, $mstart, $m[1]-$mstart);
$mark = preg_replace_callback($captionpattern, array(&$this, 'captionConvert'), $mark);
- $ret .= $mark;
- $ret .= $this->translate($m[0], $toVariant);
+ // Let's convert the trtext only once,
+ // it would give us more performance improvement
+ $notrtext[] = $mark;
+ $trtext .= $m[0] . $trtextmark;
$mstart = $m[1] + strlen($m[0]);
}
+ $notrtext[] = '';
+ $trtext = $this->translate( $trtext, $toVariant );
+ $trtext = StringUtils::explode( $trtextmark, $trtext );
+ foreach( $trtext as $t ) {
+ $ret .= array_shift($notrtext);
+ $ret .= $t;
+ }
wfProfileOut( $fname );
return $ret;
}
*/
function translate( $text, $variant ) {
wfProfileIn( __METHOD__ );
- if( !$this->mTablesLoaded )
- $this->loadTables();
- $text = $this->mTables[$variant]->replace( $text );
+ // If $text is empty or only includes spaces, do nothing
+ // Otherwise translate it
+ if( trim($text) ) {
+ if( !$this->mTablesLoaded )
+ $this->loadTables();
+ $text = $this->mTables[$variant]->replace( $text );
+ }
wfProfileOut( __METHOD__ );
return $text;
}
* prepare manual conversion table
* @private
*/
- function prepareManualConv( $convRule ){
+ function applyManualConv( $convRule ){
// use syntax -{T|zh:TitleZh;zh-tw:TitleTw}- for custom conversion in title
$title = $convRule->getTitle();
if( $title ){
//apply manual conversion table to global table
$convTable = $convRule->getConvTable();
$action = $convRule->getRulesAction();
- foreach( $convTable as $v => $t ) {
- if( !in_array( $v, $this->mVariants ) )continue;
- if( $action=="add" ) {
- foreach( $t as $from => $to ) {
+ foreach( $convTable as $variant => $pair ) {
+ if( !in_array( $variant, $this->mVariants ) )continue;
+ if( $action == 'add' ) {
+ foreach( $pair as $from => $to ) {
// to ensure that $from and $to not be left blank
// so $this->translate() could always return a string
if ( $from || $to )
// more efficient than array_merge(), about 2.5 times.
- $this->mManualAddTables[$v][$from] = $to;
- }
- }
- elseif ( $action == "remove" ) {
- foreach ( $t as $from=>$to ) {
- if ( $from || $to )
- $this->mManualRemoveTables[$v][$from] = $to;
+ $this->mTables[$variant]->setPair( $from, $to );
}
}
- }
- }
-
- /**
- * apply manual conversion from $this->mManualAddTables and $this->mManualRemoveTables
- * @private
- */
- function applyManualConv(){
- //apply manual conversion table to global table
- foreach($this->mVariants as $v) {
- if (count($this->mManualAddTables[$v]) > 0) {
- $this->mTables[$v]->mergeArray($this->mManualAddTables[$v]);
+ elseif ( $action == 'remove' ) {
+ $this->mTables[$variant]->removeArray( $pair );
}
- if (count($this->mManualRemoveTables[$v]) > 0)
- $this->mTables[$v]->removeArray($this->mManualRemoveTables[$v]);
}
}
global $wgDisableLangConversion;
/* don't do anything if this is the conversion table */
if ( $parser->getTitle()->getNamespace() == NS_MEDIAWIKI &&
- strpos($parser->mTitle->getText(), 'onversiontable') !== false )
+ strpos($parser->mTitle->getText(), "Conversiontable") !== false )
{
return $text;
}
$text = $this->convert( $text );
- if ( $this->mTitleFromFlag )
- $parser->mOutput->setTitleText( $this->mTitleDisplay );
+ $this->convertTitle();
+ $parser->mOutput->setTitleText( $this->mTitleDisplay );
+
return $text;
}
}
/**
- * convert title
+ * Pre convert title. Store the original title $this->mTitleOrginal;
+ * store the default converted title to $this->mTitleDisplay.
* @private
*/
- function convertTitle( $text, $variant ){
- global $wgDisableTitleConversion, $wgUser;
-
- // check for global param and __NOTC__ tag
- if( $wgDisableTitleConversion || !$this->mDoTitleConvert || $wgUser->getOption('noconvertlink') == 1 ) {
- $this->mTitleDisplay = $text;
- return $text;
- }
-
- // use the title from the T flag if any
- if( $this->mTitleFromFlag ){
- $this->mTitleFromFlag = false;
- return $this->mTitleDisplay;
- }
+ function preConvertTitle( $text, $variant ){
+ $this->mTitleOriginal = $text;
+
+ $text = $this->convertNamespace( $text, $variant );
+ $this->mTitleDisplay = $this->convert( $text );
+ }
- global $wgRequest;
+ /**
+ * convert title
+ * @private
+ */
+ function convertTitle(){
+ global $wgDisableTitleConversion, $wgUser, $wgRequest;
$isredir = $wgRequest->getText( 'redirect', 'yes' );
$action = $wgRequest->getText( 'action' );
$linkconvert = $wgRequest->getText( 'linkconvert', 'yes' );
- if ( $isredir == 'no' || $action == 'edit' || $action == 'submit' || $linkconvert == 'no' ) {
- return $text;
- } else {
- $text = $this->convertNamespace( $text, $variant );
- $this->mTitleDisplay = $this->convert( $text );
- return $this->mTitleDisplay;
+
+ // check for the global variable, __NOTC__ magic word, and user setting
+ if( $wgDisableTitleConversion || !$this->mDoTitleConvert ||
+ $wgUser->getOption('noconvertlink') == 1 ) {
+ $this->mTitleDisplay = $this->mTitleOriginal;
+ }
+
+ // check for GET params
+ elseif ( $isredir == 'no' || $action == 'edit' || $linkconvert == 'no' ) {
+ $this->mTitleDisplay = $this->mTitleOriginal;
}
}
$plang = $this->getPreferredVariant();
// for title convertion
- if ( $isTitle ) return $this->convertTitle( $text, $plang );
+ if ( $isTitle ) {
+ $this->preConvertTitle( $text, $plang );
+ return $text;
+ }
$tarray = StringUtils::explode( $this->mMarkup['end'], $text );
$text = '';
- $marks = array();
foreach ( $tarray as $txt ) {
+
$marked = explode( $this->mMarkup['begin'], $txt, 2 );
+
+ if( $this->mDoContentConvert )
+ // Bug 19620: should convert a string immediately after a new rule added.
+ $text .= $this->autoConvert( $marked[0], $plang );
+ else
+ $text .= $marked[0];
+
if ( array_key_exists( 1, $marked ) ) {
$crule = new ConverterRule($marked[1], $this);
$crule->parse( $plang );
- $marked[1] = $crule->getDisplay();
- $this->prepareManualConv( $crule );
+ $text .= $crule->getDisplay();
+ $this->applyManualConv( $crule );
}
else
- $marked[0] .= $this->mMarkup['end'];
- array_push( $marks, $marked );
- }
- $this->applyManualConv();
- foreach ( $marks as $marked ) {
- if( $this->mDoContentConvert )
- $text .= $this->autoConvert( $marked[0], $plang );
- else
- $text .= $marked[0];
- if( array_key_exists( 1, $marked ) )
- $text .= $marked[1];
+ $text .= $this->mMarkup['end'];
+
}
+
// Remove the last delimiter (wasn't real)
$text = substr( $text, 0, -strlen( $this->mMarkup['end'] ) );
-
return $text;
}
* @public
*/
function findVariantLink( &$link, &$nt, $ignoreOtherCond = false ) {
+ # If the article has already existed, there is no need to
+ # check it again, otherwise it may cause a fault.
+ if ( is_object( $nt ) && $nt->exists() )
+ return;
+
global $wgDisableLangConversion, $wgDisableTitleConversion, $wgRequest, $wgUser;
$isredir = $wgRequest->getText( 'redirect', 'yes' );
$action = $wgRequest->getText( 'action' );
|| $action == 'submit' || $linkconvert == 'no' || $wgUser->getOption('noconvertlink') == 1 ) ) )
return;
- if(is_object($nt))
+ if ( is_object( $nt ) )
$ns = $nt->getNamespace();
$variants = $this->autoConvertToAllVariants($link);
return $this->mTitleDisplay;
}
- /**
- * a write lock to the cache
- *
- * @private
- */
- function lockCache() {
- global $wgMemc;
- $success = false;
- for($i=0; $i<30; $i++) {
- if($success = $wgMemc->add($this->mCacheKey . "lock", 1, 10))
- break;
- sleep(1);
- }
- return $success;
- }
-
- /**
- * unlock cache
- *
- * @private
- */
- function unlockCache() {
- global $wgMemc;
- $wgMemc->delete($this->mCacheKey . "lock");
- }
-
-
/**
* Load default conversion tables
* This method must be implemented in derived class
* load conversion tables either from the cache or the disk
* @private
*/
- function loadTables( $fromcache = true ) {
+ function loadTables($fromcache=true) {
global $wgMemc;
if( $this->mTablesLoaded )
return;
// we will first load the default tables
// then update them using things in MediaWiki:Zhconversiontable/*
$this->loadDefaultTables();
- foreach( $this->mVariants as $var ) {
- $cached = $this->parseCachedTable( $var );
- // load group convert table, e.g. [[MediaWiki:Groupconversiontable-StarTrek]].
- foreach( $this->mGroups as $group ) {
- $cachedgroup = $this->parseCachedTable( $var, '', true, "Groupconversiontable-$group" );
- $cached = array_merge( $cached, $cachedgroup );
- }
- $this->mTables[$var]->mergeArray( $cached );
+ foreach($this->mVariants as $var) {
+ $cached = $this->parseCachedTable($var);
+ $this->mTables[$var]->mergeArray($cached);
}
$this->postLoadTables();
$this->mTables[self::CACHE_VERSION_KEY] = true;
-
- if($this->lockCache()) {
- $wgMemc->set($this->mCacheKey, $this->mTables, 43200);
- $this->unlockCache();
- }
+
+ $wgMemc->set($this->mCacheKey, $this->mTables, 43200);
wfProfileOut( __METHOD__.'-recache' );
}
wfProfileOut( __METHOD__ );
* and will be parsed recursively if $recursive=true
*
*/
- function parseCachedTable($code, $subpage='', $recursive=true, $table='Conversiontable') {
+ function parseCachedTable($code, $subpage='', $recursive=true) {
global $wgMessageCache;
static $parsed = array();
if(!is_object($wgMessageCache))
return array();
- $key = "$table/".$code;
+ $key = 'Conversiontable/'.$code;
if($subpage)
$key .= '/' . $subpage;
if(array_key_exists($key, $parsed))
return array();
-
+
if ( strpos( $code, '/' ) === false ) {
- $txt = $wgMessageCache->get( $table, true, $code );
+ $txt = $wgMessageCache->get( 'Conversiontable', true, $code );
} else {
- $title = Title::makeTitleSafe( NS_MEDIAWIKI, "$table/$code" );
+ $title = Title::makeTitleSafe( NS_MEDIAWIKI, "Conversiontable/$code" );
if ( $title && $title->exists() ) {
$article = new Article( $title );
$txt = $article->getContents();
$txt = '';
}
}
+
// get all subpage links of the form
// [[MediaWiki:conversiontable/zh-xx/...|...]]
- $linkhead = $this->mLangObj->getNsText(NS_MEDIAWIKI) . ":$table";
+ $linkhead = $this->mLangObj->getNsText(NS_MEDIAWIKI) . ':Conversiontable';
$subs = explode('[[', $txt);
$sublinks = array();
foreach( $subs as $sub ) {
}
}
+
// parse the mappings in this page
$blocks = explode($this->mMarkup['begin'], $txt);
array_shift($blocks);
$ret = $this->mMarkup['begin'] . 'R|' . $text . $this->mMarkup['end'];
return $ret;
}
-
- /**
- * Callback function for magicword 'groupconvert'
- *
- * @param string $group: the group name called for
- * @return blank string
- */
- function groupConvert( $group ) {
- $this->mGroups[] = $group;
- return '';
- }
}
/**
class ConverterRule {
var $mText; // original text in -{text}-
var $mConverter; // LanguageConverter object
- var $mManualCodeError='<strong class="error">code error!</strong>';
- var $mRuleDisplay = '',$mRuleTitle=false;
+ var $mManualCodeError = '<strong class="error">code error!</strong>';
+ var $mRuleDisplay = '';
+ var $mRuleTitle = false;
var $mRules = '';// string : the text of the rules
var $mRulesAction = 'none';
var $mFlags = array();
* @param object $converter a LanguageConverter object
* @access public
*/
- function __construct($text,$converter){
+ function __construct( $text, $converter ){
$this->mText = $text;
- $this->mConverter=$converter;
- foreach($converter->mVariants as $v){
- $this->mConvTable[$v]=array();
+ $this->mConverter = $converter;
+ foreach( $converter->mVariants as $v ){
+ $this->mConvTable[$v] = array();
}
}
* @return string Translated text
* @public
*/
- function getTextInBidtable($variants){
- if(is_string($variants)){ $variants=array($variants); }
- if(!is_array($variants)) return false;
- foreach ($variants as $variant){
- if(array_key_exists($variant, $this->mBidtable)){
+ function getTextInBidtable( $variants ){
+ if( is_string( $variants ) ){ $variants = array( $variants ); }
+ if( !is_array( $variants ) ) return false;
+ foreach( $variants as $variant ){
+ if( array_key_exists( $variant, $this->mBidtable ) ){
return $this->mBidtable[$variant];
}
}
continue;// syntax error, skip
$to = trim($v[1]);
$v = trim($v[0]);
- $u = explode($markup['unidsep'], $v);
+ $u = explode($markup['unidsep'], $v, 2);
// if $to is empty, strtr() could return a wrong result
if( count($u) == 1 && $to && in_array( $v, $variants ) ) {
$bidtable[$v] = $to;
* Parse rules conversion
* @private
*/
- function getRuleConvertedStr($variant,$doConvert){
+ function getRuleConvertedStr( $variant, $doConvert ){
$bidtable = $this->mBidtable;
$unidtable = $this->mUnidtable;
if( count($bidtable) + count($unidtable) == 0 ){
return $this->mRules;
- } elseif ($doConvert){// the text converted
+ } elseif ( $doConvert ){// the text converted
// display current variant in bidirectional array
$disp = $this->getTextInBidtable($variant);
// or display current variant in fallbacks
fill to convert tables */
$allow_unid = $manLevel[$v]=='bidirectional'
|| $manLevel[$v]=='unidirectional';
- if($allow_unid && array_key_exists($v,$unidtable)){
- $ct=$this->mConvTable[$v];
- $this->mConvTable[$v] = array_merge($ct,$unidtable[$v]);
+ if( $allow_unid && array_key_exists( $v, $unidtable ) ){
+ $ct = $this->mConvTable[$v];
+ $this->mConvTable[$v] = array_merge($ct, $unidtable[$v]);
}
}
}
dépôts / lhc / web / wiklou.git / blobdiff