var $mVariants, $mVariantFallbacks, $mVariantNames;
var $mTablesLoaded = false;
var $mTables;
- var $mManualAddTables;
- var $mManualRemoveTables;
var $mNamespaceTables;
var $mTitleDisplay='';
var $mDoTitleConvert=true, $mDoContentConvert=true;
// these flags above are reserved for program
'A'=>'A', // add rule for convert code (all text convert)
'T'=>'T', // title convert
- 'R'=>'R', // row content
+ 'R'=>'R', // raw content
'D'=>'D', // convert description (subclass implement)
'-'=>'-', // remove convert (not implement)
'H'=>'H', // add rule for convert code (but no display in placed code )
$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;
}
return $this->mPreferredVariant;
}
- # FIXME rewrite code for parsing http header. The current code
- # is written specific for detecting zh- variants
if( !$this->mPreferredVariant ) {
// see if some supported language variant is set in the
// http header, but we don't set the mPreferredVariant
// variable in case this is called before the user's
// preference is loaded
- $pv=$this->mMainLanguageCode;
- if(array_key_exists('HTTP_ACCEPT_LANGUAGE', $_SERVER)) {
- $header = str_replace( '_', '-', strtolower($_SERVER["HTTP_ACCEPT_LANGUAGE"]));
- $zh = strstr($header, $pv.'-');
- if($zh) {
- $ary = split("[,;]",$zh);
- $pv = $ary[0];
+ if( array_key_exists( 'HTTP_ACCEPT_LANGUAGE', $_SERVER ) ) {
+ $acceptLanguage = strtolower( $_SERVER['HTTP_ACCEPT_LANGUAGE'] );
+
+ // explode by comma
+ $result = explode(',', $acceptLanguage);
+
+ $languages = array();
+
+ foreach( $result as $elem ) {
+ // if $elem likes 'zh-cn;q=0.9'
+ if(($posi = strpos( $elem, ';' )) !== false ) {
+ // get the real language code likes 'zh-cn'
+ $languages[] = substr( $elem, 0, $posi );
+ }
+ else {
+ $languages[] = $elem;
+ }
+ }
+
+ $fallback_languages = array();
+ foreach( $languages as $language ) {
+ // strip whitespace
+ $language = trim( $language );
+ if( in_array( $language, $this->mVariants ) ) {
+ return $language;
+ }
+ 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;
+ }
}
}
- // don't try to return bad variant
- if(in_array( $pv, $this->mVariants ))
- return $pv;
}
return $this->mMainLanguageCode;
-
}
/**
* 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;
+ foreach( $convTable as $variant => $pair ) {
+ if( !in_array( $variant, $this->mVariants ) )continue;
if( $action=="add" ) {
- foreach( $t as $from => $to ) {
+ 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;
+ $this->mTables[$variant]->setPair( $from, $to );
}
}
elseif ( $action == "remove" ) {
- foreach ( $t as $from=>$to ) {
- if ( $from || $to )
- $this->mManualRemoveTables[$v][$from] = $to;
- }
+ $this->mTables[$variant]->removeArray( $pair );
}
}
}
- /**
- * 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]);
- }
- if (count($this->mManualRemoveTables[$v]) > 0)
- $this->mTables[$v]->removeArray($this->mManualRemoveTables[$v]);
- }
- }
-
/**
* Convert text using a parser object for context
* @public
$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 );
+
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'] ) );
* @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 ( $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);
* @public
*/
function armourMath($text){
+ // we need to convert '-{' and '}-' to '-{' and '}-'
+ // to avoid a unwanted '}-' appeared after the math-image.
+ $text = strtr( $text, array('-{' => '-{', '}-' => '}-') );
$ret = $this->mMarkup['begin'] . 'R|' . $text . $this->mMarkup['end'];
return $ret;
}
$flags=array_diff($flags,array('S'));
$flags_temp = array();
foreach ($variants as $variant) {
+ // try to find flags like "zh-hans", "zh-hant"
+ // allow syntaxes like "-{zh-hans;zh-hant|XXXX}-"
if ( in_array($variant, $flags) )
$flags_temp[] = $variant;
}
- if ( count($flags_temp) == 0 )
+ if ( count($flags_temp) !== 0 )
$flags = $flags_temp;
}
if ( count($flags) == 0 )
$bidtable = array();
$unidtable = array();
$markup = $this->mConverter->mMarkup;
+ $variants = $this->mConverter->mVariants;
+
+ // varsep_pattern for preg_split:
+ // 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>;}-
+ // 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] => ''
+ // )
+ $varsep_pattern = '/' . $markup['varsep'] . '\s*' . '(?=';
+ foreach( $variants as $variant ) {
+ $varsep_pattern .= $variant . '\s*' . $markup['codesep'] . '|'; // zh-hans:xxx;zh-hant:yyy
+ $varsep_pattern .= '[^;]*?' . $markup['unidsep'] . '\s*' . $variant
+ . '\s*' . $markup['codesep'] . '|'; // xxx=>zh-hans:yyy; xxx=>zh-hant:zzz
+ }
+ $varsep_pattern .= '\s*$)/';
+
+ $choice = preg_split($varsep_pattern, $rules);
- $choice = explode($markup['varsep'], $rules);
- foreach($choice as $c) {
+ foreach( $choice as $c ) {
$v = explode($markup['codesep'], $c, 2);
if( count($v) != 2 )
continue;// syntax error, skip
$to = trim($v[1]);
$v = trim($v[0]);
$u = explode($markup['unidsep'], $v);
- if( count($u) == 1 ) {
+ // if $to is empty, strtr() could return a wrong result
+ if( count($u) == 1 && $to && in_array( $v, $variants ) ) {
$bidtable[$v] = $to;
} else if(count($u) == 2){
$from = trim($u[0]);
$v = trim($u[1]);
- if( array_key_exists( $v, $unidtable ) && !is_array( $unidtable[$v] ) )
+ if( array_key_exists( $v, $unidtable ) && !is_array( $unidtable[$v] )
+ && $to && in_array( $v, $variants ) )
$unidtable[$v] = array( $from=>$to );
- else
+ elseif ( $to && in_array( $v, $variants ) )
$unidtable[$v][$from] = $to;
}
// syntax error, pass
$this->parseFlags();
$flags = $this->mFlags;
- //convert to specified variant
+ // convert to specified variant
+ // syntax: -{zh-hans;zh-hant[;...]|<text to convert>}-
if( count( array_diff( $flags, $variants ) ) == 0 and count( $flags ) != 0 ) {
- if ( in_array( $variant, $flags ) )
+ if ( in_array( $variant, $flags ) ) // check if current variant in flags
+ // then convert <text to convert> to current language
$this->mRules = $this->mConverter->autoConvert( $this->mRules, $variant );
- else {
+ else { // if current variant no in flags,
+ // then we check its fallback variants.
$variantFallbacks = $this->mConverter->getVariantFallbacks($variant);
foreach ( $variantFallbacks as $variantFallback ) {
+ // if current variant's fallback exist in flags
if ( in_array( $variantFallback, $flags ) ) {
+ // then convert <text to convert> to fallback language
$this->mRules = $this->mConverter->autoConvert( $this->mRules, $variantFallback );
break;
}
}
if( !in_array( 'R', $flags ) || !in_array( 'N', $flags ) ) {
- //FIXME: may cause trouble here...
- //strip since it interferes with the parsing, plus,
- //all spaces should be stripped in this tag anyway.
- $this->mRules = str_replace(' ', '', $this->mRules);
// decode => HTML entities modified by Sanitizer::removeHTMLtags
$this->mRules = str_replace('=>','=>',$this->mRules);
dépôts / lhc / web / wiklou.git / blobdiff