Add RELEASE-NOTES-1.18.old into RELEASE-NOTES-1.18

[lhc/web/wiklou.git] / languages / LanguageConverter.php

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 0abab57..ba89be7 100644 (file)
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -322,10 +322,6 @@ class LanguageConverter {
                        }
                }
 
-               if( $this->guessVariant( $text, $toVariant ) ) {
-                       return $text;
-               }
-
                /* we convert everything except:
                   1. HTML markups (anything between < and >)
                   2. HTML entities
@@ -575,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 );
@@ -776,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.