From 69fd49f825f7b6702b9b796f0b913b7837b5bb4c Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Tue, 28 Jun 2011 12:00:04 +0000
Subject: [PATCH] Revert r86623: merging Serbian language improvements to
 trunk. Per CR: this needs some tests, and I really don't know what's going on
 here well enough to write them :)

---
 languages/LanguageConverter.php  | 21 +--------------------
 languages/classes/LanguageSr.php | 25 -------------------------
 2 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 7921d551bb..ba89be741b 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -322,11 +322,6 @@ class LanguageConverter {
 			}
 		}
 
-		if( $this->guessVariant( $text, $toVariant ) ) {
-			wfProfileOut( __METHOD__ );
-			return $text;
-		}
-
 		/* we convert everything except:
 		   1. HTML markups (anything between < and >)
 		   2. HTML entities
@@ -576,7 +571,7 @@ class LanguageConverter {
 	 */
 	public function convertTo( $text, $variant ) {
 		global $wgDisableLangConversion;
-		if ( $wgDisableLangConversion || $this->guessVariant( $text, $variant ) ) {
+		if ( $wgDisableLangConversion ) {
 			return $text;
 		}
 		return $this->recursiveConvertTopLevel( $text, $variant );
@@ -777,20 +772,6 @@ class LanguageConverter {
 		return '!' . $variant;
 	}
 
-	/**
-	 * Guess if a text is written in a variant. This should be implemented in subclasses.
-	 *
-	 * @param string	$text the text to be checked
-	 * @param string	$variant language code of the variant to be checked for
-	 * @return bool	true if $text appears to be written in $variant, false if not
-	 *
-	 * @author Nikola Smolenski <smolensk@eunet.rs>
-	 * @since 1.18
-	 */
-	public function guessVariant($text, $variant) {
-		return false;
-	}
-
 	/**
 	 * Load default conversion tables.
 	 * This method must be implemented in derived class.
diff --git a/languages/classes/LanguageSr.php b/languages/classes/LanguageSr.php
index 2c1f7acdf0..b26a254389 100644
--- a/languages/classes/LanguageSr.php
+++ b/languages/classes/LanguageSr.php
@@ -173,30 +173,6 @@ class SrConverter extends LanguageConverter {
 
 		return $ret;
 	}
-
-	/**
-	 * Guess if a text is written in Cyrillic or Latin.
-	 *
-	 * @author Nikola Smolenski <smolensk@eunet.rs>
-	 * @since 1.18
-	 *
-	 * @param $text string
-	 * @param $variant string
-	 *
-	 * @return bool
-	 */
-	public function guessVariant( $text, $variant ) {
-		$numCyrillic = preg_match_all("/[шђчћжШЂЧЋЖ]/u", $text, $dummy);
-		$numLatin = preg_match_all("/[šđč枊ĐČĆŽ]/u", $text, $dummy);
-
-		if( $variant == 'sr-ec' ) {
-			return $numCyrillic > $numLatin;
-		} elseif( $variant == 'sr-el' ) {
-			return $numLatin > $numCyrillic;
-		} else {
-			return false;
-		}
-	}
 }
 
 /**
@@ -257,5 +233,4 @@ class LanguageSr extends LanguageSr_ec {
 			}
 		}
 	}
-
 }
-- 
2.20.1