Merge "Delete skins/common/images/magnify-clip.png"

[lhc/web/wiklou.git] / languages / classes / LanguageKk.php

diff --git a/languages/classes/LanguageKk.php b/languages/classes/LanguageKk.php
index 1ab3c51..39e62f5 100644 (file)
--- a/languages/classes/LanguageKk.php
+++ b/languages/classes/LanguageKk.php
@@ -250,8 +250,8 @@ class KkConverter extends LanguageConverter {
         *    names as they were
         *  - do not try to find variants for usernames
         *
-        * @param string $link
-        * @param Title $nt
+        * @param string &$link
+        * @param Title &$nt
         * @param bool $ignoreOtherCond
         */
        function findVariantLink( &$link, &$nt, $ignoreOtherCond = false ) {
@@ -270,26 +270,6 @@ class KkConverter extends LanguageConverter {
                }
        }
 
-       /**
-        * An ugly function wrapper for parsing Image titles
-        * (to prevent image name conversion)
-        *
-        * @param string $text
-        * @param bool $toVariant
-        *
-        * @return string
-        */
-       function autoConvert( $text, $toVariant = false ) {
-               global $wgTitle;
-               if ( is_object( $wgTitle ) && $wgTitle->getNamespace() == NS_FILE ) {
-                       $imagename = $wgTitle->getNsText();
-                       if ( preg_match( "/^$imagename:/", $text ) ) {
-                               return $text;
-                       }
-               }
-               return parent::autoConvert( $text, $toVariant );
-       }
-
        /**
         *  It translates text into variant
         *
@@ -299,27 +279,22 @@ class KkConverter extends LanguageConverter {
         * @return string
         */
        function translate( $text, $toVariant ) {
-               global $wgLanguageCode;
                $text = parent::translate( $text, $toVariant );
 
                switch ( $toVariant ) {
                        case 'kk-cyrl':
                        case 'kk-kz':
                                $letters = KK_L_UC . KK_L_LC . 'ʺʹ#0123456789';
-                               $wgLanguageCode = 'kk';
                                break;
                        case 'kk-latn':
                        case 'kk-tr':
                                $letters = KK_C_UC . KK_C_LC . '№0123456789';
-                               $wgLanguageCode = 'kk-Latn';
                                break;
                        case 'kk-arab':
                        case 'kk-cn':
                                $letters = KK_C_UC . KK_C_LC . /*KK_L_UC.KK_L_LC.'ʺʹ'.*/',;\?%\*№0123456789';
-                               $wgLanguageCode = 'kk-Arab';
                                break;
                        default:
-                               $wgLanguageCode = 'kk';
                                return $text;
                }
                // disable conversion variables like $1, $2...