Merge "Remove extra line breaks in memcached debug output"

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

diff --git a/languages/classes/LanguageZh.php b/languages/classes/LanguageZh.php
index 4271ed3..51b09f6 100644 (file)
--- a/languages/classes/LanguageZh.php
+++ b/languages/classes/LanguageZh.php
@@ -21,9 +21,6 @@
  * @ingroup Language
  */
 
-require_once __DIR__ . '/../LanguageConverter.php';
-require_once __DIR__ . '/LanguageZh_hans.php';
-
 /**
  * @ingroup Language
  */
@@ -63,16 +60,15 @@ class ZhConverter extends LanguageConverter {
        }
 
        function loadDefaultTables() {
-               require __DIR__ . "/../../includes/ZhConversion.php";
                $this->mTables = array(
-                       'zh-hans' => new ReplacementArray( $zh2Hans ),
-                       'zh-hant' => new ReplacementArray( $zh2Hant ),
-                       'zh-cn' => new ReplacementArray( $zh2CN ),
-                       'zh-hk' => new ReplacementArray( $zh2HK ),
-                       'zh-mo' => new ReplacementArray( $zh2HK ),
-                       'zh-my' => new ReplacementArray( $zh2SG ),
-                       'zh-sg' => new ReplacementArray( $zh2SG ),
-                       'zh-tw' => new ReplacementArray( $zh2TW ),
+                       'zh-hans' => new ReplacementArray( MediaWiki\Languages\Data\ZhConversion::$zh2Hans ),
+                       'zh-hant' => new ReplacementArray( MediaWiki\Languages\Data\ZhConversion::$zh2Hant ),
+                       'zh-cn' => new ReplacementArray( MediaWiki\Languages\Data\ZhConversion::$zh2CN ),
+                       'zh-hk' => new ReplacementArray( MediaWiki\Languages\Data\ZhConversion::$zh2HK ),
+                       'zh-mo' => new ReplacementArray( MediaWiki\Languages\Data\ZhConversion::$zh2HK ),
+                       'zh-my' => new ReplacementArray( MediaWiki\Languages\Data\ZhConversion::$zh2CN ),
+                       'zh-sg' => new ReplacementArray( MediaWiki\Languages\Data\ZhConversion::$zh2CN ),
+                       'zh-tw' => new ReplacementArray( MediaWiki\Languages\Data\ZhConversion::$zh2TW ),
                        'zh' => new ReplacementArray
                );
        }