Merge "Fix IE9's lack of support for console.warn.apply"

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

diff --git a/languages/classes/LanguageZh.php b/languages/classes/LanguageZh.php
index ac386c5..dfdc6b1 100644 (file)
--- a/languages/classes/LanguageZh.php
+++ b/languages/classes/LanguageZh.php
@@ -21,21 +21,20 @@
  * @ingroup Language
  */
 
-require_once( __DIR__ . '/../LanguageConverter.php' );
-require_once( __DIR__ . '/LanguageZh_hans.php' );
+require_once __DIR__ . '/../LanguageConverter.php';
+require_once __DIR__ . '/LanguageZh_hans.php';
 
 /**
  * @ingroup Language
  */
 class ZhConverter extends LanguageConverter {
-
        /**
-        * @param $langobj Language
-        * @param $maincode string
-        * @param $variants array
-        * @param $variantfallbacks array
-        * @param $flags array
-        * @param $manualLevel array
+        * @param Language $langobj
+        * @param string $maincode
+        * @param array $variants
+        * @param array $variantfallbacks
+        * @param array $flags
+        * @param array $manualLevel
         */
        function __construct( $langobj, $maincode,
                                                                $variants = array(),
@@ -50,31 +49,31 @@ class ZhConverter extends LanguageConverter {
                                                                        $flags,
                                                                        $manualLevel );
                $names = array(
-                       'zh'      => '原文',
+                       'zh' => '原文',
                        'zh-hans' => '简体',
                        'zh-hant' => '繁體',
-                       'zh-cn'   => '大陆',
-                       'zh-tw'   => '台灣',
-                       'zh-hk'   => '香港',
-                       'zh-mo'   => '澳門',
-                       'zh-sg'   => '新加坡',
-                       'zh-my'   => '大马',
+                       'zh-cn' => '大陆',
+                       'zh-tw' => '台灣',
+                       'zh-hk' => '香港',
+                       'zh-mo' => '澳門',
+                       'zh-sg' => '新加坡',
+                       'zh-my' => '大马',
                );
                $this->mVariantNames = array_merge( $this->mVariantNames, $names );
        }
 
        function loadDefaultTables() {
-               require( __DIR__ . "/../../includes/ZhConversion.php" );
+               require __DIR__ . "/../../includes/ZhConversion.php";
                $this->mTables = array(
                        'zh-hans' => new ReplacementArray( $zh2Hans ),
                        'zh-hant' => new ReplacementArray( $zh2Hant ),
-                       'zh-cn'   => new ReplacementArray( array_merge( $zh2Hans, $zh2CN ) ),
-                       'zh-hk'   => new ReplacementArray( array_merge( $zh2Hant, $zh2HK ) ),
-                       'zh-mo'   => new ReplacementArray( array_merge( $zh2Hant, $zh2HK ) ),
-                       'zh-my'   => new ReplacementArray( array_merge( $zh2Hans, $zh2SG ) ),
-                       'zh-sg'   => new ReplacementArray( array_merge( $zh2Hans, $zh2SG ) ),
-                       'zh-tw'   => new ReplacementArray( array_merge( $zh2Hant, $zh2TW ) ),
-                       'zh'      => new ReplacementArray
+                       'zh-cn' => new ReplacementArray( array_merge( $zh2Hans, $zh2CN ) ),
+                       'zh-hk' => new ReplacementArray( array_merge( $zh2Hant, $zh2HK ) ),
+                       'zh-mo' => new ReplacementArray( array_merge( $zh2Hant, $zh2HK ) ),
+                       'zh-my' => new ReplacementArray( array_merge( $zh2Hans, $zh2SG ) ),
+                       'zh-sg' => new ReplacementArray( array_merge( $zh2Hans, $zh2SG ) ),
+                       'zh-tw' => new ReplacementArray( array_merge( $zh2Hant, $zh2TW ) ),
+                       'zh' => new ReplacementArray
                );
        }
 
@@ -88,8 +87,8 @@ class ZhConverter extends LanguageConverter {
        }
 
        /**
-        * @param $key string
-        * @return String
+        * @param string $key
+        * @return string
         */
        function convertCategoryKey( $key ) {
                return $this->autoConvert( $key, 'zh' );
@@ -103,26 +102,36 @@ class ZhConverter extends LanguageConverter {
  * @ingroup Language
  */
 class LanguageZh extends LanguageZh_hans {
-
        function __construct() {
                global $wgHooks;
+
                parent::__construct();
 
-               $variants = array( 'zh', 'zh-hans', 'zh-hant', 'zh-cn', 'zh-hk', 'zh-mo', 'zh-my', 'zh-sg', 'zh-tw' );
+               $variants = array(
+                       'zh',
+                       'zh-hans',
+                       'zh-hant',
+                       'zh-cn',
+                       'zh-hk',
+                       'zh-mo',
+                       'zh-my',
+                       'zh-sg',
+                       'zh-tw'
+               );
 
                $variantfallbacks = array(
-                       'zh'      => array( 'zh-hans', 'zh-hant', 'zh-cn', 'zh-tw', 'zh-hk', 'zh-sg', 'zh-mo', 'zh-my' ),
+                       'zh' => array( 'zh-hans', 'zh-hant', 'zh-cn', 'zh-tw', 'zh-hk', 'zh-sg', 'zh-mo', 'zh-my' ),
                        'zh-hans' => array( 'zh-cn', 'zh-sg', 'zh-my' ),
                        'zh-hant' => array( 'zh-tw', 'zh-hk', 'zh-mo' ),
-                       'zh-cn'   => array( 'zh-hans', 'zh-sg', 'zh-my' ),
-                       'zh-sg'   => array( 'zh-hans', 'zh-cn', 'zh-my' ),
-                       'zh-my'   => array( 'zh-hans', 'zh-sg', 'zh-cn' ),
-                       'zh-tw'   => array( 'zh-hant', 'zh-hk', 'zh-mo' ),
-                       'zh-hk'   => array( 'zh-hant', 'zh-mo', 'zh-tw' ),
-                       'zh-mo'   => array( 'zh-hant', 'zh-hk', 'zh-tw' ),
+                       'zh-cn' => array( 'zh-hans', 'zh-sg', 'zh-my' ),
+                       'zh-sg' => array( 'zh-hans', 'zh-cn', 'zh-my' ),
+                       'zh-my' => array( 'zh-hans', 'zh-sg', 'zh-cn' ),
+                       'zh-tw' => array( 'zh-hant', 'zh-hk', 'zh-mo' ),
+                       'zh-hk' => array( 'zh-hant', 'zh-mo', 'zh-tw' ),
+                       'zh-mo' => array( 'zh-hant', 'zh-hk', 'zh-tw' ),
                );
                $ml = array(
-                       'zh'      => 'disable',
+                       'zh' => 'disable',
                        'zh-hans' => 'unidirectional',
                        'zh-hant' => 'unidirectional',
                );
@@ -138,7 +147,7 @@ class LanguageZh extends LanguageZh_hans {
        /**
         * this should give much better diff info
         *
-        * @param $text string
+        * @param string $text
         * @return string
         */
        function segmentForDiff( $text ) {
@@ -146,7 +155,7 @@ class LanguageZh extends LanguageZh_hans {
        }
 
        /**
-        * @param $text string
+        * @param string $text
         * @return string
         */
        function unsegmentForDiff( $text ) {
@@ -156,9 +165,9 @@ class LanguageZh extends LanguageZh_hans {
        /**
         * auto convert to zh-hans and normalize special characters.
         *
-        * @param $string String
-        * @param $autoVariant String, default to 'zh-hans'
-        * @return String
+        * @param string $string
+        * @param string $autoVariant default to 'zh-hans'
+        * @return string
         */
        function normalizeForSearch( $string, $autoVariant = 'zh-hans' ) {
                wfProfileIn( __METHOD__ );
@@ -176,7 +185,7 @@ class LanguageZh extends LanguageZh_hans {
        }
 
        /**
-        * @param $termsArray array
+        * @param array $termsArray
         * @return array
         */
        function convertForSearchResult( $termsArray ) {
@@ -187,4 +196,3 @@ class LanguageZh extends LanguageZh_hans {
                return $ret;
        }
 }
-