Index: trunk/phase3/languages/LanguageConverter.php
===================================================================
--- trunk/phase3/languages/LanguageConverter.php (revision 49396)
+++ trunk/phase3/languages/LanguageConverter.php (revision 49397)
@@ -487,10 +487,11 @@
*
* @param string $text text to be converted
* @param bool $isTitle whether this conversion is for the article title
+ * @param string $variant the variant we convert to
* @return string converted text
* @public
*/
- function convert( $text, $isTitle = false ) {
+ function convert( $text, $isTitle = false, $variant = none ) {
$mw =& MagicWord::get( 'notitleconvert' );
if( $mw->matchAndRemove( $text ) )
@@ -505,7 +506,10 @@
if( $mw->matchStart( $text ) )
return $text;
- $plang = $this->getPreferredVariant();
+ if( $variant && in_array( $variant, $this->mVariants ) )
+ $plang = $variant;
+ else
+ $plang = $this->getPreferredVariant();
// for title convertion
if ( $isTitle ) return $this->convertTitle( $text, $plang );
Index: trunk/phase3/languages/Language.php
===================================================================
--- trunk/phase3/languages/Language.php (revision 49396)
+++ trunk/phase3/languages/Language.php (revision 49397)
@@ -35,7 +35,7 @@
class FakeConverter {
var $mLang;
function FakeConverter($langobj) {$this->mLang = $langobj;}
- function convert($t, $i) {return $t;}
+ function convert($t, $i, $v) {return $t;}
function parserConvert($t, $p) {return $t;}
function getVariants() { return array( $this->mLang->getCode() ); }
function getPreferredVariant() {return $this->mLang->getCode(); }
@@ -2183,8 +2183,8 @@
}
# convert text to different variants of a language.
- function convert( $text, $isTitle = false) {
- return $this->mConverter->convert($text, $isTitle);
+ function convert( $text, $isTitle = false, $variant = none) {
+ return $this->mConverter->convert($text, $isTitle, $variant);
}
# Convert text from within Parser
