Revert r86623: merging Serbian language improvements to trunk. Per CR: this needs...

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 7921d55..ba89be7 100644 (file)
--- 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 2c1f7ac..b26a254 100644 (file)
--- 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 {
                        }
                }
        }
-
 }