From: Philip Tzou <philip@users.mediawiki.org>
Date: Sat, 11 Apr 2009 10:56:09 +0000 (+0000)
Subject: A new optional param for LanguageConverter::convert(), to enable a new function named... 
X-Git-Tag: 1.31.0-rc.0~42171
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=commitdiff_plain;h=0b5569d94ec21ef55c9485578561100663810cd8;p=lhc%2Fweb%2Fwiklou.git

A new optional param for LanguageConverter::convert(), to enable a new function named 'convert()' which added to AbuseFilter.
---

diff --git a/languages/Language.php b/languages/Language.php
index d629c4834e..cf4949cb96 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -35,7 +35,7 @@ if( function_exists( 'mb_strtoupper' ) ) {
 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 @@ class Language {
 	}
 
 	# 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
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 0255d66886..5b48ef98bb 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -487,10 +487,11 @@ class LanguageConverter {
 	 *
 	 * @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 @@ class LanguageConverter {
 		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 );