var $mTablesLoaded = false;
var $mTables;
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 $mTitleOriginal = '';
+ var $mTitleDisplay = '';
const CACHE_VERSION_KEY = 'VERSION 6';
/**
* 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 ) ) {
+ if( $fromHeader && array_key_exists( 'HTTP_ACCEPT_LANGUAGE', $_SERVER ) ) {
$acceptLanguage = strtolower( $_SERVER['HTTP_ACCEPT_LANGUAGE'] );
-
// explode by comma
$result = explode(',', $acceptLanguage);
}
}
}
-
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;
}
$action = $convRule->getRulesAction();
foreach( $convTable as $variant => $pair ) {
if( !in_array( $variant, $this->mVariants ) )continue;
- if( $action=="add" ) {
+ 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
$this->mTables[$variant]->setPair( $from, $to );
}
}
- elseif ( $action == "remove" ) {
+ elseif ( $action == 'remove' ) {
$this->mTables[$variant]->removeArray( $pair );
}
}
$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 = '';
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