Localisation updates Kazakh translations

(bug 12145) Patch by AlefZet

diff --git a/languages/classes/LanguageKk.php b/languages/classes/LanguageKk.php
index edae379..cf90e96 100644 (file)
--- a/languages/classes/LanguageKk.php
+++ b/languages/classes/LanguageKk.php
@@ -12,9 +12,9 @@ define( 'KK_C_UC', 'АӘБВГҒДЕЁЖЗИЙКҚЛМНҢОӨПРСТУҰҮФХ
 define( 'KK_C_LC', 'аәбвгғдеёжзийкқлмнңоөпрстуұүфхһцчшщъыіьэюя' ); # Kazakh Cyrillic lowercase
 define( 'KK_L_UC', 'AÄBCÇDEÉFGĞHIİÏJKLMNÑOÖPQRSŞTUÜVWXYÝZ' ); # Kazakh Latin uppercase
 define( 'KK_L_LC', 'aäbcçdeéfgğhıiïjklmnñoöpqrsştuüvwxyýz' ); # Kazakh Latin lowercase
-//define( 'KK_A', 'اٵبۆگعدەجزيكقلمنڭوٶپرستۋۇٷفحھچشىٸ' ); # Kazakh Arabic
+//define( 'KK_A', 'ٴابپتجحدرزسشعفقكلمنڭەوۇۋۆىيچھ' ); # Kazakh Arabic
 define( 'H_HAMZA', 'ٴ' ); # U+0674 ARABIC LETTER HIGH HAMZA
-define( 'ZWNJ', '‌' ); # U+200C ZERO WIDTH NON-JOINER
+//define( 'ZWNJ', '‌' ); # U+200C ZERO WIDTH NON-JOINER
 
 class KkConverter extends LanguageConverter {
        
@@ -431,27 +431,26 @@ class LanguageKk extends LanguageKk_cyrl {
        }
 
        function convertGrammar( $word, $case ) {
-               $fname="LanguageKk::convertGrammar";
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                $variant = $this->getPreferredVariant();
                switch ( $variant ) {
                        case 'kk-arab':
                        case 'kk-cn':
-                               $word = parent::convertGrammar( $word, $case, $variant = 'kk-arab' );
+                               $word = parent::convertGrammarKk_arab( $word, $case );
                                break;
                        case 'kk-latn':
                        case 'kk-tr':
-                               $word = parent::convertGrammar( $word, $case, $variant = 'kk-latn' );
+                               $word = parent::convertGrammarKk_latn( $word, $case );
                                break;
                        case 'kk-cyrl':
                        case 'kk-kz':
                        case 'kk':
                        default:
-                               $word = parent::convertGrammar( $word, $case, $variant = 'kk-cyrl' );
+                               $word = parent::convertGrammarKk_cyrl( $word, $case );
                }
 
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $word;
        }
 

diff --git a/languages/classes/LanguageKk_cyrl.php b/languages/classes/LanguageKk_cyrl.php
index 7b2a092..a7f0757 100644 (file)
--- a/languages/classes/LanguageKk_cyrl.php
+++ b/languages/classes/LanguageKk_cyrl.php
@@ -13,14 +13,6 @@ class LanguageKk_cyrl extends Language {
        /**
         * Cases: genitive, dative, accusative, locative, ablative, comitative + possessive forms
         */
-       function convertGrammar( $word, $case, $variant ) {
-               global $wgGrammarForms;
-
-               if ($variant='kk-cyrl') { $word = self::convertGrammarKk_cyrl( $word, $case ); }
-               if ($variant='kk-latn') { $word = self::convertGrammarKk_latn( $word, $case ); }
-               if ($variant='kk-arab') { $word = self::convertGrammarKk_arab( $word, $case ); }
-               return $word;
-       }
 
        function convertGrammarKk_cyrl( $word, $case ) {
                global $wgGrammarForms;

diff --git a/languages/messages/MessagesKk.php b/languages/messages/MessagesKk.php
index 88d33bd..27a7242 100644 (file)
--- a/languages/messages/MessagesKk.php
+++ b/languages/messages/MessagesKk.php
@@ -9,10 +9,10 @@
 
 $fallback = 'kk-kz';
 
-$linkTrail = '/^([a-zäçéğıïñöşüýа-яёәғіқңөұүһاٵبۆگعدەجزيكقلمنڭوٶپرستۋۇٷفحھچشىٸʺʹ“»]+)(.*)$/sDu';
+$linkTrail = '/^([a-zäçéğıïñöşüýʺʹа-яёәғіқңөұүһٴابپتجحدرزسشعفقكلمنڭەوۇۋۆىيچھ“»]+)(.*)$/sDu';
 
 $messages = array(
-'linkprefix' => '/^(.*?)([a-zäçéğıïñöşüýа-яёәіңғүұқөһA-ZÄÇÉĞİÏÑÖŞÜÝА-ЯЁӘІҢҒҮҰҚӨҺاٵبۆگعدەجزيكقلمنڭوٶپرستۋۇٷفحھچشىٸʺʹ«„]+)$/sDu',
+'linkprefix' => '/^(.*?)([a-zäçéğıïñöşüýA-ZÄÇÉĞİÏÑÖŞÜÝʺʹа-яёәіңғүұқөһА-ЯЁӘІҢҒҮҰҚӨҺٴابپتجحدرزسشعفقكلمنڭەوۇۋۆىيچھ«„]+)$/sDu',
 
 # Stylesheets
 'common.css'   => '/* Мындағы CSS барлық безендіру мәнеріндерде қолданылады */',