Index: trunk/phase3/languages/messages/MessagesKk.php |
— | — | @@ -9,10 +9,10 @@ |
10 | 10 | |
11 | 11 | $fallback = 'kk-kz'; |
12 | 12 | |
13 | | -$linkTrail = '/^([a-zäçéğıïñöşüýа-яёәғіқңөұүһاٵبۆگعدەجزيكقلمنڭوٶپرستۋۇٷفحھچشىٸʺʹ“»]+)(.*)$/sDu'; |
| 13 | +$linkTrail = '/^([a-zäçéğıïñöşüýʺʹа-яёәғіқңөұүһٴابپتجحدرزسشعفقكلمنڭەوۇۋۆىيچھ“»]+)(.*)$/sDu'; |
14 | 14 | |
15 | 15 | $messages = array( |
16 | | -'linkprefix' => '/^(.*?)([a-zäçéğıïñöşüýа-яёәіңғүұқөһA-ZÄÇÉĞİÏÑÖŞÜÝА-ЯЁӘІҢҒҮҰҚӨҺاٵبۆگعدەجزيكقلمنڭوٶپرستۋۇٷفحھچشىٸʺʹ«„]+)$/sDu', |
| 16 | +'linkprefix' => '/^(.*?)([a-zäçéğıïñöşüýA-ZÄÇÉĞİÏÑÖŞÜÝʺʹа-яёәіңғүұқөһА-ЯЁӘІҢҒҮҰҚӨҺٴابپتجحدرزسشعفقكلمنڭەوۇۋۆىيچھ«„]+)$/sDu', |
17 | 17 | |
18 | 18 | # Stylesheets |
19 | 19 | 'common.css' => '/* Мындағы CSS барлық безендіру мәнеріндерде қолданылады */', |
Index: trunk/phase3/languages/classes/LanguageKk_cyrl.php |
— | — | @@ -13,15 +13,7 @@ |
14 | 14 | /** |
15 | 15 | * Cases: genitive, dative, accusative, locative, ablative, comitative + possessive forms |
16 | 16 | */ |
17 | | - function convertGrammar( $word, $case, $variant ) { |
18 | | - global $wgGrammarForms; |
19 | 17 | |
20 | | - if ($variant='kk-cyrl') { $word = self::convertGrammarKk_cyrl( $word, $case ); } |
21 | | - if ($variant='kk-latn') { $word = self::convertGrammarKk_latn( $word, $case ); } |
22 | | - if ($variant='kk-arab') { $word = self::convertGrammarKk_arab( $word, $case ); } |
23 | | - return $word; |
24 | | - } |
25 | | - |
26 | 18 | function convertGrammarKk_cyrl( $word, $case ) { |
27 | 19 | global $wgGrammarForms; |
28 | 20 | if ( isset( $wgGrammarForms['kk-kz'][$case][$word] ) ) { |
Index: trunk/phase3/languages/classes/LanguageKk.php |
— | — | @@ -12,9 +12,9 @@ |
13 | 13 | define( 'KK_C_LC', 'аәбвгғдеёжзийкқлмнңоөпрстуұүфхһцчшщъыіьэюя' ); # Kazakh Cyrillic lowercase |
14 | 14 | define( 'KK_L_UC', 'AÄBCÇDEÉFGĞHIİÏJKLMNÑOÖPQRSŞTUÜVWXYÝZ' ); # Kazakh Latin uppercase |
15 | 15 | define( 'KK_L_LC', 'aäbcçdeéfgğhıiïjklmnñoöpqrsştuüvwxyýz' ); # Kazakh Latin lowercase |
16 | | -//define( 'KK_A', 'اٵبۆگعدەجزيكقلمنڭوٶپرستۋۇٷفحھچشىٸ' ); # Kazakh Arabic |
| 16 | +//define( 'KK_A', 'ٴابپتجحدرزسشعفقكلمنڭەوۇۋۆىيچھ' ); # Kazakh Arabic |
17 | 17 | define( 'H_HAMZA', 'ٴ' ); # U+0674 ARABIC LETTER HIGH HAMZA |
18 | | -define( 'ZWNJ', '' ); # U+200C ZERO WIDTH NON-JOINER |
| 18 | +//define( 'ZWNJ', '' ); # U+200C ZERO WIDTH NON-JOINER |
19 | 19 | |
20 | 20 | class KkConverter extends LanguageConverter { |
21 | 21 | |
— | — | @@ -431,27 +431,26 @@ |
432 | 432 | } |
433 | 433 | |
434 | 434 | function convertGrammar( $word, $case ) { |
435 | | - $fname="LanguageKk::convertGrammar"; |
436 | | - wfProfileIn( $fname ); |
| 435 | + wfProfileIn( __METHOD__ ); |
437 | 436 | |
438 | 437 | $variant = $this->getPreferredVariant(); |
439 | 438 | switch ( $variant ) { |
440 | 439 | case 'kk-arab': |
441 | 440 | case 'kk-cn': |
442 | | - $word = parent::convertGrammar( $word, $case, $variant = 'kk-arab' ); |
| 441 | + $word = parent::convertGrammarKk_arab( $word, $case ); |
443 | 442 | break; |
444 | 443 | case 'kk-latn': |
445 | 444 | case 'kk-tr': |
446 | | - $word = parent::convertGrammar( $word, $case, $variant = 'kk-latn' ); |
| 445 | + $word = parent::convertGrammarKk_latn( $word, $case ); |
447 | 446 | break; |
448 | 447 | case 'kk-cyrl': |
449 | 448 | case 'kk-kz': |
450 | 449 | case 'kk': |
451 | 450 | default: |
452 | | - $word = parent::convertGrammar( $word, $case, $variant = 'kk-cyrl' ); |
| 451 | + $word = parent::convertGrammarKk_cyrl( $word, $case ); |
453 | 452 | } |
454 | 453 | |
455 | | - wfProfileOut( $fname ); |
| 454 | + wfProfileOut( __METHOD__ ); |
456 | 455 | return $word; |
457 | 456 | } |
458 | 457 | |