dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Use HTMLForm to generate the form on Special:ListFiles"
[lhc/web/wiklou.git]
/
languages
/
classes
/
LanguageZh.php
diff --git
a/languages/classes/LanguageZh.php
b/languages/classes/LanguageZh.php
index
d413018
..
67f8769
100644
(file)
--- a/
languages/classes/LanguageZh.php
+++ b/
languages/classes/LanguageZh.php
@@
-28,14
+28,13
@@
require_once __DIR__ . '/LanguageZh_hans.php';
* @ingroup Language
*/
class ZhConverter extends LanguageConverter {
* @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(),
*/
function __construct( $langobj, $maincode,
$variants = array(),
@@
-88,8
+87,8
@@
class ZhConverter extends LanguageConverter {
}
/**
}
/**
- * @param
$key string
- * @return
S
tring
+ * @param
string $key
+ * @return
s
tring
*/
function convertCategoryKey( $key ) {
return $this->autoConvert( $key, 'zh' );
*/
function convertCategoryKey( $key ) {
return $this->autoConvert( $key, 'zh' );
@@
-103,12
+102,22
@@
class ZhConverter extends LanguageConverter {
* @ingroup Language
*/
class LanguageZh extends LanguageZh_hans {
* @ingroup Language
*/
class LanguageZh extends LanguageZh_hans {
-
function __construct() {
global $wgHooks;
function __construct() {
global $wgHooks;
+
parent::__construct();
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' ),
$variantfallbacks = array(
'zh' => array( 'zh-hans', 'zh-hant', 'zh-cn', 'zh-tw', 'zh-hk', 'zh-sg', 'zh-mo', 'zh-my' ),
@@
-138,7
+147,7
@@
class LanguageZh extends LanguageZh_hans {
/**
* this should give much better diff info
*
/**
* this should give much better diff info
*
- * @param
$text string
+ * @param
string $text
* @return string
*/
function segmentForDiff( $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 ) {
* @return string
*/
function unsegmentForDiff( $text ) {
@@
-156,9
+165,9
@@
class LanguageZh extends LanguageZh_hans {
/**
* auto convert to zh-hans and normalize special characters.
*
/**
* auto convert to zh-hans and normalize special characters.
*
- * @param
$string S
tring
- * @param
$autoVariant String, default
to 'zh-hans'
- * @return
S
tring
+ * @param
string $s
tring
+ * @param
string $autoVariant Defaults
to 'zh-hans'
+ * @return
s
tring
*/
function normalizeForSearch( $string, $autoVariant = 'zh-hans' ) {
wfProfileIn( __METHOD__ );
*/
function normalizeForSearch( $string, $autoVariant = 'zh-hans' ) {
wfProfileIn( __METHOD__ );
@@
-176,7
+185,7
@@
class LanguageZh extends LanguageZh_hans {
}
/**
}
/**
- * @param
$termsArray a
rray
+ * @param
array $termsA
rray
* @return array
*/
function convertForSearchResult( $termsArray ) {
* @return array
*/
function convertForSearchResult( $termsArray ) {
@@
-187,4
+196,3
@@
class LanguageZh extends LanguageZh_hans {
return $ret;
}
}
return $ret;
}
}
-