From b9b85843572bf283f48285001e276ba7e61b63f6 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 22 Feb 2009 13:37:51 +0100
Subject: updated to MediaWiki 1.14.0

---
 languages/classes/LanguageBe.php        |  57 ----------------
 languages/classes/LanguageBe_tarask.php |  57 ----------------
 languages/classes/LanguageBs.php        |  92 +------------------------
 languages/classes/LanguageCs.php        | 116 ++------------------------------
 languages/classes/LanguageDsb.php       |  82 ++--------------------
 languages/classes/LanguageGa.php        |  11 ---
 languages/classes/LanguageGsw.php       |  65 ------------------
 languages/classes/LanguageHsb.php       |  77 +--------------------
 languages/classes/LanguageHu.php        |  27 --------
 languages/classes/LanguageKk.php        |   8 +--
 languages/classes/LanguageKu.php        |  28 ++------
 languages/classes/LanguageKu_ku.php     |  11 ---
 languages/classes/LanguageLv.php        |  27 --------
 languages/classes/LanguageMy.php        |  18 +++++
 languages/classes/LanguageRmy.php       |  73 --------------------
 languages/classes/LanguageRu.php        |  11 +--
 languages/classes/LanguageSk.php        |  72 --------------------
 languages/classes/LanguageSl.php        |  49 +-------------
 languages/classes/LanguageSr.php        |   6 +-
 languages/classes/LanguageYue.php       |  28 ++++----
 languages/classes/LanguageZh.php        |  10 +--
 21 files changed, 69 insertions(+), 856 deletions(-)
 delete mode 100644 languages/classes/LanguageGsw.php
 create mode 100644 languages/classes/LanguageMy.php
 delete mode 100644 languages/classes/LanguageRmy.php

(limited to 'languages/classes')

diff --git a/languages/classes/LanguageBe.php b/languages/classes/LanguageBe.php
index 7633f031..1468daff 100644
--- a/languages/classes/LanguageBe.php
+++ b/languages/classes/LanguageBe.php
@@ -31,61 +31,4 @@ class LanguageBe extends Language {
 			}
 		}
 	}
-
-	# Convert from the nominative form of a noun to some other case
-	# Invoked with {{GRAMMAR:case|word}}
-	/**
-   * Cases: родны, вінавальны, месны
-   */
-	function convertGrammar( $word, $case ) {
-		switch ( $case ) {
-			case 'родны': # genitive
-				if ( $word == 'Вікіпэдыя' ) {
-					$word = 'Вікіпэдыі';
-				} elseif ( $word == 'ВікіСлоўнік' ) {
-					$word = 'ВікіСлоўніка';
-				} elseif ( $word == 'ВікіКнігі' ) {
-					$word = 'ВікіКніг';
-				} elseif ( $word == 'ВікіКрыніца' ) {
-					$word = 'ВікіКрыніцы';
-				} elseif ( $word == 'ВікіНавіны' ) {
-					$word = 'ВікіНавін';
-				} elseif ( $word == 'ВікіВіды' ) {
-					$word = 'ВікіВідаў';
-				}
-			break;
-			case 'вінавальны': # akusative
-				if ( $word == 'Вікіпэдыя' ) {
-					$word = 'Вікіпэдыю';
-				} elseif ( $word == 'ВікіСлоўнік' ) {
-					$word = 'ВікіСлоўнік';
-				} elseif ( $word == 'ВікіКнігі' ) {
-					$word = 'ВікіКнігі';
-				} elseif ( $word == 'ВікіКрыніца' ) {
-					$word = 'ВікіКрыніцу';
-				} elseif ( $word == 'ВікіНавіны' ) {
-					$word = 'ВікіНавіны';
-				} elseif ( $word == 'ВікіВіды' ) {
-					$word = 'ВікіВіды';
-				}
-			break;
-			case 'месны': # prepositional
-				if ( $word == 'Вікіпэдыя' ) {
-					$word = 'Вікіпэдыі';
-				} elseif ( $word == 'ВікіСлоўнік' ) {
-					$word = 'ВікіСлоўніку';
-				} elseif ( $word == 'ВікіКнігі' ) {
-					$word = 'ВікіКнігах';
-				} elseif ( $word == 'ВікіКрыніца' ) {
-					$word = 'ВікіКрыніцы';
-				} elseif ( $word == 'ВікіНавіны' ) {
-					$word = 'ВікіНавінах';
-				} elseif ( $word == 'ВікіВіды' ) {
-					$word = 'ВікіВідах';
-				}
-			break;
-		}
-
-		return $word; # this will return the original value for 'назоўны' (nominative) and all undefined case values
-	}
 }
diff --git a/languages/classes/LanguageBe_tarask.php b/languages/classes/LanguageBe_tarask.php
index 312735da..358cb486 100644
--- a/languages/classes/LanguageBe_tarask.php
+++ b/languages/classes/LanguageBe_tarask.php
@@ -39,61 +39,4 @@ class LanguageBe_tarask extends Language {
 			}
 		}
 	}
-
-	# Convert from the nominative form of a noun to some other case
-	# Invoked with {{GRAMMAR:case|word}}
-	/**
-   * Cases: родны, вінавальны, месны
-   */
-	function convertGrammar( $word, $case ) {
-		switch ( $case ) {
-			case 'родны': # genitive
-				if ( $word == 'Вікіпэдыя' ) {
-					$word = 'Вікіпэдыі';
-				} elseif ( $word == 'ВікіСлоўнік' ) {
-					$word = 'ВікіСлоўніка';
-				} elseif ( $word == 'ВікіКнігі' ) {
-					$word = 'ВікіКніг';
-				} elseif ( $word == 'ВікіКрыніца' ) {
-					$word = 'ВікіКрыніцы';
-				} elseif ( $word == 'ВікіНавіны' ) {
-					$word = 'ВікіНавін';
-				} elseif ( $word == 'ВікіВіды' ) {
-					$word = 'ВікіВідаў';
-				}
-			break;
-			case 'вінавальны': # akusative
-				if ( $word == 'Вікіпэдыя' ) {
-					$word = 'Вікіпэдыю';
-				} elseif ( $word == 'ВікіСлоўнік' ) {
-					$word = 'ВікіСлоўнік';
-				} elseif ( $word == 'ВікіКнігі' ) {
-					$word = 'ВікіКнігі';
-				} elseif ( $word == 'ВікіКрыніца' ) {
-					$word = 'ВікіКрыніцу';
-				} elseif ( $word == 'ВікіНавіны' ) {
-					$word = 'ВікіНавіны';
-				} elseif ( $word == 'ВікіВіды' ) {
-					$word = 'ВікіВіды';
-				}
-			break;
-			case 'месны': # prepositional
-				if ( $word == 'Вікіпэдыя' ) {
-					$word = 'Вікіпэдыі';
-				} elseif ( $word == 'ВікіСлоўнік' ) {
-					$word = 'ВікіСлоўніку';
-				} elseif ( $word == 'ВікіКнігі' ) {
-					$word = 'ВікіКнігах';
-				} elseif ( $word == 'ВікіКрыніца' ) {
-					$word = 'ВікіКрыніцы';
-				} elseif ( $word == 'ВікіНавіны' ) {
-					$word = 'ВікіНавінах';
-				} elseif ( $word == 'ВікіВіды' ) {
-					$word = 'ВікіВідах';
-				}
-			break;
-		}
-
-		return $word; # this will return the original value for 'назоўны' (nominative) and all undefined case values
-	}
 }
diff --git a/languages/classes/LanguageBs.php b/languages/classes/LanguageBs.php
index ee2eb6a6..24f6adde 100644
--- a/languages/classes/LanguageBs.php
+++ b/languages/classes/LanguageBs.php
@@ -34,99 +34,11 @@ class LanguageBs extends Language {
 			return $wgGrammarForms['bs'][$case][$word];
 		}
 		switch ( $case ) {
-			case 'genitiv': # genitive
-				if ( $word == 'Wikipedia' ) {
-					$word = 'Wikipedije';
-				} elseif ( $word == 'Wikiknjige' ) {
-					$word = 'Wikiknjiga';
-				} elseif ( $word == 'Wikivijesti' ) {
-					$word = 'Wikivijesti';
-				} elseif ( $word == 'Wikicitati' ) {
-					$word = 'Wikicitata';
-				} elseif ( $word == 'Wikiizvor' ) {
-					$word = 'Wikiizvora';
-				} elseif ( $word == 'Vikirječnik' ) {
-					$word = 'Vikirječnika';
-				}
-			break;
-			case 'dativ': # dative
-				if ( $word == 'Wikipedia' ) {
-					$word = 'Wikipediji';
-				} elseif ( $word == 'Wikiknjige' ) {
-					$word = 'Wikiknjigama';
-				} elseif ( $word == 'Wikicitati' ) {
-					$word = 'Wikicitatima';
-				} elseif ( $word == 'Wikivijesti' ) {
-					$word = 'Wikivijestima';
-				} elseif ( $word == 'Wikiizvor' ) {
-					$word = 'Wikiizvoru';
-				} elseif ( $word == 'Vikirječnik' ) {
-					$word = 'Vikirječniku';
-				}
-			break;
-			case 'akuzativ': # akusative
-				if ( $word == 'Wikipedia' ) {
-					$word = 'Wikipediju';
-				} elseif ( $word == 'Wikiknjige' ) {
-					$word = 'Wikiknjige';
-				} elseif ( $word == 'Wikicitati' ) {
-					$word = 'Wikicitate';
-				} elseif ( $word == 'Wikivijesti' ) {
-					$word = 'Wikivijesti';
-				} elseif ( $word == 'Wikiizvor' ) {
-					$word = 'Wikiizvora';
-				} elseif ( $word == 'Vikirječnik' ) {
-					$word = 'Vikirječnika';
-				}
-			break;
-			case 'vokativ': # vocative
-				if ( $word == 'Wikipedia' ) {
-					$word = 'Wikipedijo';
-				} elseif ( $word == 'Wikiknjige' ) {
-					$word = 'Wikiknjige';
-				} elseif ( $word == 'Wikicitati' ) {
-					$word = 'Wikicitati';
-				} elseif ( $word == 'Wikivijesti' ) {
-					$word = 'Wikivijesti';
-				} elseif ( $word == 'Wikiizvor' ) {
-					$word = 'Wikizivoru';
-				} elseif ( $word == 'Vikirječnik' ) {
-					$word = 'Vikirječniče';
-				}
-			break;
 			case 'instrumental': # instrumental
-				if ( $word == 'Wikipedia' ) {
-					$word = 's Wikipediom';
-				} elseif ( $word == 'Wikiknjige' ) {
-					$word = 's Wikiknjigama';
-				} elseif ( $word == 'Wikicitati' ) {
-					$word = 's Wikicitatima';
-				} elseif ( $word == 'Wikivijesti' ) {
-					$word = 's Wikivijestima';
-				} elseif ( $word == 'Wikiizvor' ) {
-					$word = 's Wikiizvorom';
-				} elseif ( $word == 'Vikirječnik' ) {
-					$word = 's Vikirječnikom';
-				} else {
-					$word = 's ' . $word;
-				}
+				$word = 's ' . $word;
 			break;
 			case 'lokativ': # locative
-				if ( $word == 'Wikipedia' ) {
-					$word = 'o Wikipediji';
-				} elseif ( $word == 'Wikiknjige' ) {
-					$word = 'o Wikiknjigama';
-				} elseif ( $word == 'Wikicitati' ) {
-					$word = 'o Wikicitatima';
-				} elseif ( $word == 'Wikivijesti' ) {
-					$word = 'o Wikivijestima';
-				} elseif ( $word == 'Wikiizvor' ) {
-					$word = 'o Wikiizvoru';
-				} elseif ( $word == 'Vikirječnik' ) {
-					$word = 'o Vikirječniku';
-				} else {
-					$word = 'o ' . $word;
-				}
+				$word = 'o ' . $word;
 			break;
 		}
 
diff --git a/languages/classes/LanguageCs.php b/languages/classes/LanguageCs.php
index 9c523d98..ca1669b9 100644
--- a/languages/classes/LanguageCs.php
+++ b/languages/classes/LanguageCs.php
@@ -1,120 +1,16 @@
 <?php
 
-/** Czech (česky)
+/** Czech (čeština [subst.], český [adj.], česky [adv.])
  *
  * @ingroup Language
  */
 class LanguageCs extends Language {
-	# Grammatical transformations, needed for inflected languages
-	# Invoked by putting {{grammar:case|word}} in a message
-	function convertGrammar( $word, $case ) {
-		global $wgGrammarForms;
-		if ( isset($wgGrammarForms['cs'][$case][$word]) ) {
-			return $wgGrammarForms['cs'][$case][$word];
-		}
-		# allowed values for $case:
-		#	1sg, 2sg, ..., 7sg -- nominative, genitive, ... (in singular)
-		switch ( $word ) {
-			case 'Wikibooks':
-			case 'Wikiknihy':
-				switch ( $case ) {
-					case '2sg':
-						return 'Wikiknih';
-					case '3sg':
-						return 'Wikiknihám';
-					case '6sg':
-						return 'Wikiknihách';
-					case '7sg':
-						return 'Wikiknihami';
-					default:
-						return 'Wikiknihy';
-				}
-			case 'Wikipedia':
-			case 'Wikipedie':
-				switch ( $case ) {
-					case '3sg':
-					case '4sg':
-					case '6sg':
-						return 'Wikipedii';
-					case '7sg':
-						return 'Wikipedií';
-					default:
-						return 'Wikipedie';
-				}
-			case 'Wiktionary':
-			case 'Wikcionář':
-			case 'Wikislovník':
-				switch ( $case ) {
-					case '2sg':
-					case '3sg':
-					case '5sg':
-					case '6sg':
-						return 'Wikislovníku';
-					case '7sg':
-						return 'Wikislovníkem';
-					default:
-						return 'Wikislovník';
-				}
-			case 'Wikiquote':
-			case 'Wikicitáty':
-				switch ( $case ) {
-					case '2sg':
-						return 'Wikicitátů';
-					case '3sg':
-						return 'Wikicitátům';
-					case '6sg':
-						return 'Wikicitátech';
-					default:
-						return 'Wikicitáty';
-				}
-			case 'Wikinews':
-			case 'Wikizprávy':
-				switch ( $case ) {
-					case '2sg':
-						return 'Wikizpráv';
-					case '3sg':
-						return 'Wikizprávám';
-					case '6sg':
-						return 'Wikizprávách';
-					case '7sg':
-						return 'Wikizprávami';
-					default:
-						return 'Wikizprávy';
-				}
-			case 'Wikiversity':
-			case 'Wikiverzita':
-				switch ( $case ) {
-					case '2sg':
-						return 'Wikiverzity';
-					case '3sg':
-					case '6sg':
-						return 'Wikiverzitě';
-					case '4sg':
-						return 'Wikiverzitu';
-					case '5sg':
-						return 'Wikiverzito';
-					case '7sg':
-						return 'Wikiverzitou';
-					default:
-						return 'Wikiverzita';
-				}
-			case 'Wikispecies':
-			case 'Wikidruhy':
-				switch ( $case ) {
-					case '2sg':
-						return 'Wikidruhů';
-					case '3sg':
-						return 'Wikidruhům';
-					case '6sg':
-						return 'Wikidruzích';
-					default:
-						return 'Wikidruhy';
-				}
-		}
-		# unknown
-		return $word;
-	}
 
+	# Plural transformations
+	# Invoked by putting
+	#   {{plural:count|form1|form2-4|form0,5+}} for two forms plurals
+	#   {{plural:count|form1|form0,2+}} for single form plurals
+	# in a message
 	function convertPlural( $count, $forms ) {
 		if ( !count($forms) ) { return ''; }
 		$forms = $this->preConvertPlural( $forms, 3 );
diff --git a/languages/classes/LanguageDsb.php b/languages/classes/LanguageDsb.php
index 88887998..4ea1b893 100644
--- a/languages/classes/LanguageDsb.php
+++ b/languages/classes/LanguageDsb.php
@@ -11,89 +11,15 @@ class LanguageDsb extends Language {
 
 	function convertGrammar( $word, $case ) {
 		global $wgGrammarForms;
-		if ( isset( $wgGrammarForms['hsb'][$case][$word] ) ) {
-			return $wgGrammarForms['hsb'][$case][$word];
+		if ( isset( $wgGrammarForms['dsb'][$case][$word] ) ) {
+			return $wgGrammarForms['dsb'][$case][$word];
 		}
 
 		switch ( $case ) {
-			case 'genitiw': # genitive
-				if ( $word == 'Wikipedija' ) {
-					$word = 'Wikipedije';
-				} elseif ( $word == 'Wikiknihi' ) {
-					$word = 'Wikiknih';
-				} elseif ( $word == 'Wikinowiny' ) {
-					$word = 'Wikinowin';
-				} elseif ( $word == 'Wikižórło' ) {
-					$word = 'Wikižórła';
-				} elseif ( $word == 'Wikicitaty' ) {
-					$word = 'Wikicitatow';
-				} elseif ( $word == 'Wikisłownik' ) {
-					$word = 'Wikisłownika';
-				}
-				break;
-			case 'datiw': # dativ
-				if ( $word == 'Wikipedija' ) {
-					$word = 'Wikipediji';
-				} elseif ( $word == 'Wikiknihi' ) {
-					$word = 'Wikikniham';
-				} elseif ( $word == 'Wikinowiny' ) {
-					$word = 'Wikinowinam';
-				} elseif ( $word == 'Wikižórło' ) {
-					$word = 'Wikižórłu';
-				} elseif ( $word == 'Wikicitaty' ) {
-					$word = 'Wikicitatam';
-				} elseif ( $word == 'Wikisłownik' ) {
-					$word = 'Wikisłownikej';
-				}
-				break;
-			case 'akuzativ': # akuzativ
-				if ( $word == 'Wikipedija' ) {
-					$word = 'Wikipediju';
-				} elseif ( $word == 'Wikiknihi' ) {
-					$word = 'Wikiknknihi';
-				} elseif ( $word == 'Wikinowiny' ) {
-					$word = 'Wikinowiny';
-				} elseif ( $word == 'Wikižórło' ) {
-					$word = 'Wikižórło';
-				} elseif ( $word == 'Wikicitaty' ) {
-					$word = 'Wikicitaty';
-				} elseif ( $word == 'Wikisłownik' ) {
-					$word = 'Wikisłownik';
-				}
-				break;
 			case 'instrumental': # instrumental
-				if ( $word == 'Wikipedija' ) {
-					$word = 'Wikipediju';
-				} elseif ( $word == 'Wikiknihi' ) {
-					$word = 'Wikiknihami';
-				} elseif ( $word == 'Wikinowiny' ) {
-					$word = 'Wikinowinami';
-				} elseif ( $word == 'Wikižórło' ) {
-					$word = 'Wikižórłom';
-				} elseif ( $word == 'Wikicitaty' ) {
-					$word = 'Wikicitatami';
-				} elseif ( $word == 'Wikisłownik' ) {
-					$word = 'Wikisłownikom';
-				} else {
-					$word = 'z ' . $word;
-				}
-				break;
+				$word = 'z ' . $word;
 			case 'lokatiw': # lokatiw
-				if ( $word == 'Wikipedija' ) {
-					$word = 'Wikipediji';
-				} elseif ( $word == 'Wikiknihi' ) {
-					$word = 'Wikiknihach';
-				} elseif ( $word == 'Wikinowiny' ) {
-					$word = 'Wikinowinach';
-				} elseif ( $word == 'Wikižórło' ) {
-					$word = 'Wikižórłu';
-				} elseif ( $word == 'Wikicitaty' ) {
-					$word = 'Wikicitatach';
-				} elseif ( $word == 'Wikisłownik' ) {
-					$word = 'Wikisłowniku';
-				} else {
-					$word = 'wo ' . $word;
-				}
+				$word = 'wo ' . $word;
 				break;
 			}
 
diff --git a/languages/classes/LanguageGa.php b/languages/classes/LanguageGa.php
index fc1546a8..2fdeed04 100644
--- a/languages/classes/LanguageGa.php
+++ b/languages/classes/LanguageGa.php
@@ -14,17 +14,6 @@ class LanguageGa extends Language {
 		}
 
 		switch ( $case ) {
-		case 'genitive':
-			switch ($word) {
-			case 'Vicipéid':     $word = 'Vicipéide'; break;
-			case 'Vicífhoclóir': $word = 'Vicífhoclóra'; break;
-			case 'Vicíleabhair': $word = 'Vicíleabhar'; break;
-			case 'Vicíshliocht': $word = 'Vicíshleachta'; break;
-			case 'Vicífhoinse':  $word = 'Vicífhoinse'; break;
-			case 'Vicíghnéithe': $word = 'Vicíghnéithe'; break;
-			case 'Vicínuacht':   $word = 'Vicínuachta'; break;
-			}
-
 		case 'ainmlae':
 			switch ($word) {
 			case 'an Domhnach':
diff --git a/languages/classes/LanguageGsw.php b/languages/classes/LanguageGsw.php
deleted file mode 100644
index 3a1b4139..00000000
--- a/languages/classes/LanguageGsw.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/** Alemannic (Alemannisch)
- *
- * @ingroup Language
- */
-class LanguageGsw extends Language {
-   # Convert from the nominative form of a noun to some other case
-   # Invoked with result
-
-   function convertGrammar( $word, $case ) {
-       global $wgGrammarForms;
-       if ( isset($wgGrammarForms['gsw'][$case][$word]) ) {
-           return $wgGrammarForms['gsw'][$case][$word];
-       }
-       switch ( $case ) {
-           case 'dativ':
-               if ( $word == 'Wikipedia' ) {
-                   $word = 'vo de Wikipedia';
-               } elseif ( $word == 'Wikinorchrichte' ) {
-                   $word = 'vo de Wikinochrichte';
-               } elseif ( $word == 'Wiktionaire' ) {
-                   $word = 'vom Wiktionaire';
-               } elseif ( $word == 'Wikibuecher' ) {
-                   $word = 'vo de Wikibuecher';
-               } elseif ( $word == 'Wikisprüch' ) {
-                   $word = 'vo de Wikisprüch';
-               } elseif ( $word == 'Wikiquälle' ) {
-                   $word = 'vo de Wikiquälle';
-               }
-               break;
-           case 'akkusativ':
-               if ( $word == 'Wikipedia' ) {
-                   $word = 'd Wikipedia';
-               } elseif ( $word == 'Wikinorchrichte' ) {
-                   $word = 'd Wikinochrichte';
-               } elseif ( $word == 'Wiktionaire' ) {
-                   $word = 's Wiktionaire';
-               } elseif ( $word == 'Wikibuecher' ) {
-                   $word = 'd Wikibuecher';
-               } elseif ( $word == 'Wikisprüch' ) {
-                   $word = 'd Wikisprüch';
-               } elseif ( $word == 'Wikiquälle' ) {
-                   $word = 'd Wikiquälle';
-               }
-               break;
-           case 'nominativ':
-               if ( $word == 'Wikipedia' ) {
-                   $word = 'd Wikipedia';
-               } elseif ( $word == 'Wikinorchrichte' ) {
-                   $word = 'd Wikinochrichte';
-               } elseif ( $word == 'Wiktionaire' ) {
-                   $word = 's Wiktionaire';
-               } elseif ( $word == 'Wikibuecher' ) {
-                   $word = 'd Wikibuecher';
-               } elseif ( $word == 'Wikisprüch' ) {
-                   $word = 'd Wikisprüch';
-               } elseif ( $word == 'Wikiquälle' ) {
-                   $word = 'd Wikiquälle';
-               }
-               break;
-       }
-       return $word;
-   }
-}
diff --git a/languages/classes/LanguageHsb.php b/languages/classes/LanguageHsb.php
index efbaab39..f1418782 100644
--- a/languages/classes/LanguageHsb.php
+++ b/languages/classes/LanguageHsb.php
@@ -16,84 +16,11 @@ class LanguageHsb extends Language {
 		}
 
 		switch ( $case ) {
-			case 'genitiw': # genitive
-				if ( $word == 'Wikipedija' ) {
-					$word = 'Wikipedije';
-				} elseif ( $word == 'Wikiknihi' ) {
-					$word = 'Wikiknih';
-				} elseif ( $word == 'Wikinowiny' ) {
-					$word = 'Wikinowin';
-				} elseif ( $word == 'Wikižórło' ) {
-					$word = 'Wikižórła';
-				} elseif ( $word == 'Wikicitaty' ) {
-					$word = 'Wikicitatow';
-				} elseif ( $word == 'Wikisłownik' ) {
-					$word = 'Wikisłownika';
-				}
-				break;
-			case 'datiw': # dativ
-				if ( $word == 'Wikipedija' ) {
-					$word = 'Wikipediji';
-				} elseif ( $word == 'Wikiknihi' ) {
-					$word = 'Wikikniham';
-				} elseif ( $word == 'Wikinowiny' ) {
-					$word = 'Wikinowinam';
-				} elseif ( $word == 'Wikižórło' ) {
-					$word = 'Wikižórłu';
-				} elseif ( $word == 'Wikicitaty' ) {
-					$word = 'Wikicitatam';
-				} elseif ( $word == 'Wikisłownik' ) {
-					$word = 'Wikisłownikej';
-				}
-				break;
-			case 'akuzativ': # akuzativ
-				if ( $word == 'Wikipedija' ) {
-					$word = 'Wikipediju';
-				} elseif ( $word == 'Wikiknihi' ) {
-					$word = 'Wikiknknihi';
-				} elseif ( $word == 'Wikinowiny' ) {
-					$word = 'Wikinowiny';
-				} elseif ( $word == 'Wikižórło' ) {
-					$word = 'Wikižórło';
-				} elseif ( $word == 'Wikicitaty' ) {
-					$word = 'Wikicitaty';
-				} elseif ( $word == 'Wikisłownik' ) {
-					$word = 'Wikisłownik';
-				}
-				break;
 			case 'instrumental': # instrumental
-				if ( $word == 'Wikipedija' ) {
-					$word = 'Wikipediju';
-				} elseif ( $word == 'Wikiknihi' ) {
-					$word = 'Wikiknihami';
-				} elseif ( $word == 'Wikinowiny' ) {
-					$word = 'Wikinowinami';
-				} elseif ( $word == 'Wikižórło' ) {
-					$word = 'Wikižórłom';
-				} elseif ( $word == 'Wikicitaty' ) {
-					$word = 'Wikicitatami';
-				} elseif ( $word == 'Wikisłownik' ) {
-					$word = 'Wikisłownikom';
-				} else {
-					$word = 'z ' . $word;
-				}
+				$word = 'z ' . $word;
 				break;
 			case 'lokatiw': # lokatiw
-				if ( $word == 'Wikipedija' ) {
-					$word = 'Wikipediji';
-				} elseif ( $word == 'Wikiknihi' ) {
-					$word = 'Wikiknihach';
-				} elseif ( $word == 'Wikinowiny' ) {
-					$word = 'Wikinowinach';
-				} elseif ( $word == 'Wikižórło' ) {
-					$word = 'Wikižórłu';
-				} elseif ( $word == 'Wikicitaty' ) {
-					$word = 'Wikicitatach';
-				} elseif ( $word == 'Wikisłownik' ) {
-					$word = 'Wikisłowniku';
-				} else {
-					$word = 'wo ' . $word;
-				}
+				$word = 'wo ' . $word;
 				break;
 			}
 
diff --git a/languages/classes/LanguageHu.php b/languages/classes/LanguageHu.php
index d247b498..7845bdbb 100644
--- a/languages/classes/LanguageHu.php
+++ b/languages/classes/LanguageHu.php
@@ -11,31 +11,6 @@ class LanguageHu extends Language {
 			return $wgGrammarForms[$this->getCode()][$case][$word];
 		}
 
-		static $localForms = array(
-			'rol' => array(
-				'Wikipédia'   => 'Wikipédiáról',
-				'Wikidézet'   => 'Wikidézetről',
-				'Wikiszótár'  => 'Wikiszótárról',
-				'Wikikönyvek' => 'Wikikönyvekről',
-			),
-			'ba' => array(
-				'Wikipédia'   => 'Wikipédiába',
-				'Wikidézet'   => 'Wikidézetbe',
-				'Wikiszótár'  => 'Wikiszótárba',
-				'Wikikönyvek' => 'Wikikönyvekbe',
-			),
-			'k' => array(
-				'Wikipédia'   => 'Wikipédiák',
-				'Wikidézet'   => 'Wikidézetek',
-				'Wikiszótár'  => 'Wikiszótárak',
-				'Wikikönyvek' => 'Wikikönyvek',
-			)
-		);
-
-		if ( isset( $localForms[$case][$word] ) ) {
-			return $localForms[$case][$word];
-		}
-
 		switch ( $case ) {
 			case 'rol':
 				return $word . 'ról';
@@ -46,5 +21,3 @@ class LanguageHu extends Language {
 		}
 	}
 }
-
-
diff --git a/languages/classes/LanguageKk.php b/languages/classes/LanguageKk.php
index 34c5c39a..73f0a1f9 100644
--- a/languages/classes/LanguageKk.php
+++ b/languages/classes/LanguageKk.php
@@ -225,7 +225,7 @@ class KkConverter extends LanguageConverter {
 	 *    names as they were
 	 *  - do not try to find variants for usernames
 	 */
-	function findVariantLink( &$link, &$nt ) {
+	function findVariantLink( &$link, &$nt, $forTemplate = false ) {
 		// check for user namespace
 		if(is_object($nt)){
 			$ns = $nt->getNamespace();
@@ -234,8 +234,8 @@ class KkConverter extends LanguageConverter {
 		}
 
 		$oldlink=$link;
-		parent::findVariantLink($link,$nt);
-		if($this->getPreferredVariant()==$this->mMainLanguageCode)
+		parent::findVariantLink( $link, $nt, $forTemplate );
+		if( $this->getPreferredVariant()==$this->mMainLanguageCode )
 			$link=$oldlink;
 	}
 
@@ -245,7 +245,7 @@ class KkConverter extends LanguageConverter {
 	 */
 	function autoConvert($text, $toVariant=false) {
 		global $wgTitle;
-		if(is_object($wgTitle) && $wgTitle->getNameSpace()==NS_IMAGE){
+		if(is_object($wgTitle) && $wgTitle->getNameSpace()==NS_FILE){
 			$imagename = $wgTitle->getNsText();
 			if(preg_match("/^$imagename:/",$text)) return $text;
 		}
diff --git a/languages/classes/LanguageKu.php b/languages/classes/LanguageKu.php
index 55eb0d56..3137c7e8 100644
--- a/languages/classes/LanguageKu.php
+++ b/languages/classes/LanguageKu.php
@@ -148,7 +148,7 @@ class KuConverter extends LanguageConverter {
 	 *     names as they were
 	 *   - do not try to find variants for usernames
 	 */
-	function findVariantLink( &$link, &$nt ) {
+	function findVariantLink( &$link, &$nt, $forTemplate = false ) {
 		// check for user namespace
 		if(is_object($nt)){
 			$ns = $nt->getNamespace();
@@ -157,8 +157,8 @@ class KuConverter extends LanguageConverter {
 		}
 
 		$oldlink=$link;
-		parent::findVariantLink($link,$nt);
-		if($this->getPreferredVariant()==$this->mMainLanguageCode)
+		parent::findVariantLink( $link, $nt, $forTemplate );
+		if( $this->getPreferredVariant() == $this->mMainLanguageCode )
 			$link=$oldlink;
 	}
 
@@ -178,7 +178,7 @@ class KuConverter extends LanguageConverter {
 	 */
 	function autoConvert($text, $toVariant=false) {
 		global $wgTitle;
-		if(is_object($wgTitle) && $wgTitle->getNameSpace()==NS_IMAGE){
+		if(is_object($wgTitle) && $wgTitle->getNameSpace()==NS_FILE){
 			$imagename = $wgTitle->getNsText();
 			if(preg_match("/^$imagename:/",$text)) return $text;
 		}
@@ -244,24 +244,4 @@ class LanguageKu extends LanguageKu_ku {
 		$this->mConverter = new KuConverter( $this, 'ku', $variants, $variantfallbacks );
 		$wgHooks['ArticleSaveComplete'][] = $this->mConverter;
 	}
-
-/*   From Kazakh interface, not needed for the moment
-
-	function convertGrammar( $word, $case ) {
-		$fname="LanguageKu::convertGrammar";
-		wfProfileIn( $fname );
-
-		//always convert to ku-latn before convertGrammar
-		$w1 = $word;
-		$word = $this->mConverter->autoConvert( $word, 'ku-latn' );
-		$w2 = $word;
-		$word = parent::convertGrammar( $word, $case );
-		//restore encoding
-		if( $w1 != $w2 ) {
-			$word = $this->mConverter->translate( $word, 'ku-latn' );
-		}
-		wfProfileOut( $fname );
-		return $word;
-	}
-*/
 }
diff --git a/languages/classes/LanguageKu_ku.php b/languages/classes/LanguageKu_ku.php
index 5dec67e6..cf2107ec 100644
--- a/languages/classes/LanguageKu_ku.php
+++ b/languages/classes/LanguageKu_ku.php
@@ -6,17 +6,6 @@
  */
 class LanguageKu_ku extends Language {
 
-/**  	# Convert from the nominative form of a noun to some other case
-	# Invoked with {{GRAMMAR:case|word}}
-	/**
-	 * Cases:
-	 *
-	 * From Kazakh interface, not needed at the moment, maybe later
-	 */
-	function convertGrammar( $word, $case ) {
-		return $word;
-	}
-
 	/**
 	 * Avoid grouping whole numbers between 0 to 9999
 	 */
diff --git a/languages/classes/LanguageLv.php b/languages/classes/LanguageLv.php
index 1c82831c..2c8d9f31 100644
--- a/languages/classes/LanguageLv.php
+++ b/languages/classes/LanguageLv.php
@@ -27,31 +27,4 @@ class LanguageLv extends Language {
 
 		return ( ( $count % 10 == 1 ) && ( $count % 100 != 11 ) ) ? $forms[0] : $forms[1];
 	}
-
-	# Convert from the nominative form of a noun to some other case
-	# Invoked with {{GRAMMAR:case|word}}
-	# ģenitīvs - kā, datīvs - kam, akuzatīvs - ko, lokatīvs - kur.
-	/**
-	 * Cases: ģenitīvs, datīvs, akuzatīvs, lokatīvs
-	 */
-	function convertGrammar( $word, $case ) {
-		global $wgGrammarForms;
-
-		$wgGrammarForms['lv']['ģenitīvs' ]['Vikipēdija']   = 'Vikipēdijas';
-		$wgGrammarForms['lv']['ģenitīvs' ]['Vikivārdnīca'] = 'Vikivārdnīcas';
-		$wgGrammarForms['lv']['datīvs'   ]['Vikipēdija']   = 'Vikipēdijai';
-		$wgGrammarForms['lv']['datīvs'   ]['Vikivārdnīca'] = 'Vikivārdnīcai';
-		$wgGrammarForms['lv']['akuzatīvs']['Vikipēdija']   = 'Vikipēdiju';
-		$wgGrammarForms['lv']['akuzatīvs']['Vikivārdnīca'] = 'Vikivārdnīcu';
-		$wgGrammarForms['lv']['lokatīvs' ]['Vikipēdija']   = 'Vikipēdijā';
-		$wgGrammarForms['lv']['lokatīvs' ]['Vikivārdnīca'] = 'Vikivārdnīcā';
-
-		if ( isset($wgGrammarForms['lv'][$case][$word]) ) {
-			return $wgGrammarForms['lv'][$case][$word];
-		}
-
-		return $word;
-	}
 }
-
-
diff --git a/languages/classes/LanguageMy.php b/languages/classes/LanguageMy.php
new file mode 100644
index 00000000..d76b99e7
--- /dev/null
+++ b/languages/classes/LanguageMy.php
@@ -0,0 +1,18 @@
+<?php
+/** Burmese (Myanmasa)
+ *
+ * @ingroup Language
+ * @file
+ *
+ * @author Niklas Laxström, 2008
+ */
+
+class LanguageMy extends Language {
+	function commafy($_) {
+		/* NO-op. Cannot use
+		 * $separatorTransformTable = array( ',' => '' )
+		 * That would break when parsing and doing strstr '' => 'foo';
+		 */
+		return $_;
+	}
+}
\ No newline at end of file
diff --git a/languages/classes/LanguageRmy.php b/languages/classes/LanguageRmy.php
deleted file mode 100644
index e3cab8f4..00000000
--- a/languages/classes/LanguageRmy.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
- * @ingroup Language
- */
-class LanguageRmy extends Language {
-	/**
-	 * Convert from the nominative form of a noun to some other case
-	 * Invoked with {{GRAMMAR:case|word}}
-	 *
-	 * Cases: nominative, genitive-m-sg, genitive-f-sg, dative, locative, ablative, instrumental
-	 */
-	public function convertGrammar( $word, $case ) {
-		global $wgGrammarForms;
-		if ( isset($wgGrammarForms['rmy'][$case][$word]) ) {
-			return $wgGrammarForms['rmy'][$case][$word];
-		}
-
-		switch ( $case ) {
-			case 'genitive-m-sg': # genitive (m.sg.)
-				if ( $word == 'Vikipidiya' ) {
-					$word = 'Vikipidiyako';
-				} elseif ( $word == 'Vikcyonaro' ) {
-					$word = 'Vikcyonaresko';
-				}
-			break;
-			case 'genitive-f-sg': # genitive (f.sg.)
-				if ( $word == 'Vikipidiya' ) {
-					$word = 'Vikipidiyaki';
-				} elseif ( $word == 'Vikcyonaro' ) {
-					$word = 'Vikcyonareski';
-				}
-			break;
-			case 'genitive-pl': # genitive (pl.)
-				if ( $word == 'Vikipidiya' ) {
-					$word = 'Vikipidiyake';
-				} elseif ( $word == 'Vikcyonaro' ) {
-					$word = 'Vikcyonareske';
-				}
-			break;
-			case 'dativ':
-				if ( $word == 'Vikipidiyake' ) {
-					$word = 'Wikipediji';
-				} elseif ( $word == 'Vikcyonaro' ) {
-					$word = 'Vikcyonareske';
-				}
-			break;
-			case 'locative':
-				if ( $word == 'Vikipidiyate' ) {
-					$word = 'Wikipedijo';
-				} elseif ( $word == 'Vikcyonaro' ) {
-					$word = 'Vikcyonareste';
-				}
-			break;
-			case 'ablative':
-				if ( $word == 'Vikipidiyatar' ) {
-					$word = 'o Wikipediji';
-				} elseif ( $word == 'Vikcyonaro' ) {
-					$word = 'Vikcyonarestar';
-				}
-			break;
-			case 'instrumental':
-				if ( $word == 'Vikipidiyasa' ) {
-					$word = 'z Wikipedijo';
-				} elseif ( $word == 'Vikcyonaro' ) {
-					$word = 'Vikcyonaresa';
-				}
-			break;
-		}
-
-		return $word; # this will return the original value for 'nominative' and all undefined case values
-	}
-}
diff --git a/languages/classes/LanguageRu.php b/languages/classes/LanguageRu.php
index d857920a..5933b47a 100644
--- a/languages/classes/LanguageRu.php
+++ b/languages/classes/LanguageRu.php
@@ -92,14 +92,15 @@ class LanguageRu extends Language {
 	}
 
 	/*
-	 * Russian numeric format is "12 345,67" but "1234,56"
+	 * Four-digit number should be without group commas (spaces)
+	 * See manual of style at http://ru.wikipedia.org/wiki/Википедия:Оформление_статей
+	 * So "1 234 567", "12 345" but "1234"
 	 */
-
 	function commafy($_) {
-		if (!preg_match('/^\d{1,4}$/',$_)) {
-			return strrev((string)preg_replace('/(\d{3})(?=\d)(?!\d*\.)/','$1,',strrev($_)));
-		} else {
+		if (preg_match('/^-?\d{1,4}(\.\d*)?$/',$_)) {
 			return $_;
+		} else {
+			return strrev((string)preg_replace('/(\d{3})(?=\d)(?!\d*\.)/','$1,',strrev($_)));
 		}
 	}
 }
diff --git a/languages/classes/LanguageSk.php b/languages/classes/LanguageSk.php
index 19e66bae..7ddbcbdb 100644
--- a/languages/classes/LanguageSk.php
+++ b/languages/classes/LanguageSk.php
@@ -1,82 +1,10 @@
 <?php
-
 /**
  * Slovak (Slovenčina)
  *
  * @ingroup Language
  */
 class LanguageSk extends Language {
-	# Convert from the nominative form of a noun to some other case
-	# Invoked with {{GRAMMAR:case|word}}
-	/**
-	 * Cases: genitív, datív, akuzatív, lokál, inštrumentál
-	 */
-	function convertGrammar( $word, $case ) {
-		global $wgGrammarForms;
-		if ( isset($wgGrammarForms['sk'][$case][$word]) ) {
-			return $wgGrammarForms['sk'][$case][$word];
-		}
-
-		switch ( $case ) {
-			case 'genitív':
-				if ( $word == 'Wikipédia' ) {
-					$word = 'Wikipédie';
-				} elseif ( $word == 'Wikislovník' ) {
-					$word = 'Wikislovníku';
-				} elseif ( $word == 'Wikicitáty' ) {
-					$word = 'Wikicitátov';
-				} elseif ( $word == 'Wikiknihy' ) {
-					$word = 'Wikikníh';
-				}
-			break;
-			case 'datív':
-				if ( $word == 'Wikipédia' ) {
-					$word = 'Wikipédii';
-				} elseif ( $word == 'Wikislovník' ) {
-					$word = 'Wikislovníku';
-				} elseif ( $word == 'Wikicitáty' ) {
-					$word = 'Wikicitátom';
-				} elseif ( $word == 'Wikiknihy' ) {
-					$word = 'Wikiknihám';
-				}
-			break;
-			case 'akuzatív':
-				if ( $word == 'Wikipédia' ) {
-					$word = 'Wikipédiu';
-				} elseif ( $word == 'Wikislovník' ) {
-					$word = 'Wikislovník';
-				} elseif ( $word == 'Wikicitáty' ) {
-					$word = 'Wikicitáty';
-				} elseif ( $word == 'Wikiknihy' ) {
-					$word = 'Wikiknihy';
-				}
-			break;
-			case 'lokál':
-				if ( $word == 'Wikipédia' ) {
-					$word = 'Wikipédii';
-				} elseif ( $word == 'Wikislovník' ) {
-					$word = 'Wikislovníku';
-				} elseif ( $word == 'Wikicitáty' ) {
-					$word = 'Wikicitátoch';
-				} elseif ( $word == 'Wikiknihy' ) {
-					$word = 'Wikiknihách';
-				}
-			break;
-			case 'inštrumentál':
-				if ( $word == 'Wikipédia' ) {
-					$word = 'Wikipédiou';
-				} elseif ( $word == 'Wikislovník' ) {
-					$word = 'Wikislovníkom';
-				} elseif ( $word == 'Wikicitáty' ) {
-					$word = 'Wikicitátmi';
-				} elseif ( $word == 'Wikiknihy' ) {
-					$word = 'Wikiknihami';
-				}
-			break;
-		}
-		return $word;
-	}
-
 	function convertPlural( $count, $forms ) {
 		if ( !count($forms) ) { return ''; }
 		$forms = $this->preConvertPlural( $forms, 3 );
diff --git a/languages/classes/LanguageSl.php b/languages/classes/LanguageSl.php
index 8c1b503b..734b274c 100644
--- a/languages/classes/LanguageSl.php
+++ b/languages/classes/LanguageSl.php
@@ -17,55 +17,10 @@ class LanguageSl extends Language {
 		}
 
 		switch ( $case ) {
-			case 'rodilnik': # genitive
-				switch ( $word ) {
-					case 'Wikipedija': $word = 'Wikipedije'; break 2;
-					case 'Wikiknjige': $word = 'Wikiknjig'; break 2;
-					case 'Wikinovice': $word = 'Wikinovic'; break 2;
-					case 'Wikinavedek': $word = 'Wikinavedka'; break 2;
-					case 'Wikivir': $word = 'Wikivira'; break 2;
-					case 'Wikislovar': $word = 'Wikislovarja'; break 2;
-				}
-			case 'dajalnik': # dativ
-				switch ( $word ) {
-					case 'Wikipedija': $word = 'Wikipediji'; break 2;
-					case 'Wikiknjige': $word = 'Wikiknjigam'; break 2;
-					case 'Wikinovice': $word = 'Wikinovicam'; break 2;
-					case 'Wikinavedek': $word = 'Wikinavedku'; break 2;
-					case 'Wikivir': $word = 'Wikiviru'; break 2;
-					case 'Wikislovar': $word = 'Wikislovarju'; break 2;
-				}
-			case 'tožilnik': # akuzatív
-				switch ( $word ) {
-					case 'Wikipedija': $word = 'Wikipedijo'; break 2;
-					case 'Wikiknjige':
-					case 'Wikinovice':
-					case 'Wikinavedek':
-					case 'Wikivir':
-					case 'Wikislovar':
-						// Don't change, just fall through
-						break 2;
-				}
 			case 'mestnik': # locative
-				switch ( $word ) {
-					case 'Wikipedija': $word = 'o Wikipediji'; break 2;
-					case 'Wikiknjige': $word = 'o Wikiknjigah'; break 2;
-					case 'Wikinovice': $word = 'o Wikinovicah'; break 2;
-					case 'Wikinavedek': $word = 'o Wikinavedku'; break 2;
-					case 'Wikivir': $word = 'o Wikiviru'; break 2;
-					case 'Wikislovar': $word = 'o Wikislovarju'; break 2;
-					default: $word = 'o ' . $word; break 2;
-				}
+				$word = 'o ' . $word; break;
 			case 'orodnik': # instrumental
-				switch ( $word ) {
-					case 'Wikipedija': $word = 'z Wikipedijo'; break 2;
-					case 'Wikiknjige': $word = 'z Wikiknjigami'; break 2;
-					case 'Wikinovice': $word = 'z Wikinovicami'; break 2;
-					case 'Wikinavedek': $word = 'z Wikinavedkom'; break 2;
-					case 'Wikivir': $word = 'z Wikivirom'; break 2;
-					case 'Wikislovar': $word = 'z Wikislovarjem'; break 2;
-					default: $word = 'z ' . $word;
-				}
+				$word = 'z ' . $word;
 		}
 
 		return $word; # this will return the original value for 'imenovalnik' (nominativ) and all undefined case values
diff --git a/languages/classes/LanguageSr.php b/languages/classes/LanguageSr.php
index d57c733d..cac82ce7 100644
--- a/languages/classes/LanguageSr.php
+++ b/languages/classes/LanguageSr.php
@@ -92,7 +92,7 @@ class SrConverter extends LanguageConverter {
 	 *     names as they were
 	 *   - do not try to find variants for usernames
 	 */
-	function findVariantLink( &$link, &$nt ) {
+	function findVariantLink( &$link, &$nt, $forTemplate = false ) {
 		// check for user namespace
 		if(is_object($nt)){
 			$ns = $nt->getNamespace();
@@ -101,7 +101,7 @@ class SrConverter extends LanguageConverter {
 		}
 
 		$oldlink=$link;
-		parent::findVariantLink($link,$nt);
+		parent::findVariantLink( $link, $nt, $forTemplate );
 		if($this->getPreferredVariant()==$this->mMainLanguageCode)
 			$link=$oldlink;
 	}
@@ -122,7 +122,7 @@ class SrConverter extends LanguageConverter {
 	 */
 	function autoConvert($text, $toVariant=false) {
 		global $wgTitle;
-		if(is_object($wgTitle) && $wgTitle->getNameSpace()==NS_IMAGE){
+		if(is_object($wgTitle) && $wgTitle->getNameSpace()==NS_FILE){
 			$imagename = $wgTitle->getNsText();
 			if(preg_match("/^$imagename:/",$text)) return $text;
 		}
diff --git a/languages/classes/LanguageYue.php b/languages/classes/LanguageYue.php
index fdc227b3..fc7f233c 100644
--- a/languages/classes/LanguageYue.php
+++ b/languages/classes/LanguageYue.php
@@ -4,20 +4,18 @@
  */
 class LanguageYue extends Language {
 	function stripForSearch( $string ) {
-		# MySQL fulltext index doesn't grok utf-8, so we
-		# need to fold cases and convert to hex
-		# we also separate characters as "words"
-		if( function_exists( 'mb_strtolower' ) ) {
-			return preg_replace(
-				"/([\\xc0-\\xff][\\x80-\\xbf]*)/e",
-				"' U8' . bin2hex( \"$1\" )",
-				mb_strtolower( $string ) );
-		} else {
-			list( , $wikiLowerChars ) = Language::getCaseMaps();
-			return preg_replace(
-				"/([\\xc0-\\xff][\\x80-\\xbf]*)/e",
-				"' U8' . bin2hex( strtr( \"\$1\", \$wikiLowerChars ) )",
-				$string );
-		}
+		wfProfileIn( __METHOD__ );
+
+		// eventually this should be a word segmentation
+		// for now just treat each character as a word
+		// @fixme only do this for Han characters...
+		$t = preg_replace(
+				"/([\\xc0-\\xff][\\x80-\\xbf]*)/",
+				" $1", $string);
+
+		// Do general case folding and UTF-8 armoring
+		$t = parent::stripForSearch( $t );
+		wfProfileOut( __METHOD__ );
+		return $t;
 	}
 }
diff --git a/languages/classes/LanguageZh.php b/languages/classes/LanguageZh.php
index 3d162a8e..09362690 100644
--- a/languages/classes/LanguageZh.php
+++ b/languages/classes/LanguageZh.php
@@ -126,14 +126,14 @@ class LanguageZh extends LanguageZh_hans {
 
 	// word segmentation
 	function stripForSearch( $string ) {
-		$fname="LanguageZh::stripForSearch";
-		wfProfileIn( $fname );
+		wfProfileIn( __METHOD__ );
 
 		// eventually this should be a word segmentation
 		// for now just treat each character as a word
+		// @fixme only do this for Han characters...
 		$t = preg_replace(
-				"/([\\xc0-\\xff][\\x80-\\xbf]*)/e",
-				"' ' .\"$1\"", $string);
+				"/([\\xc0-\\xff][\\x80-\\xbf]*)/",
+				" $1", $string);
 
         //always convert to zh-hans before indexing. it should be
 		//better to use zh-hans for search, since conversion from
@@ -142,7 +142,7 @@ class LanguageZh extends LanguageZh_hans {
 
 		$t = $this->mConverter->autoConvert($t, 'zh-hans');
 		$t = parent::stripForSearch( $t );
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 		return $t;
 
 	}
-- 
cgit v1.2.2