summaryrefslogtreecommitdiff
path: root/languages/classes
diff options
context:
space:
mode:
Diffstat (limited to 'languages/classes')
-rw-r--r--languages/classes/LanguageBe_tarask.php2
-rw-r--r--languages/classes/LanguageJa.php2
-rw-r--r--languages/classes/LanguageKk.php7
-rw-r--r--languages/classes/LanguageQqx.php2
-rw-r--r--languages/classes/LanguageYue.php2
-rw-r--r--languages/classes/LanguageZh.php38
-rw-r--r--languages/classes/LanguageZh_hans.php2
7 files changed, 26 insertions, 29 deletions
diff --git a/languages/classes/LanguageBe_tarask.php b/languages/classes/LanguageBe_tarask.php
index ac593801..56faa4ac 100644
--- a/languages/classes/LanguageBe_tarask.php
+++ b/languages/classes/LanguageBe_tarask.php
@@ -44,7 +44,6 @@ class LanguageBe_tarask extends Language {
* @return string
*/
function normalizeForSearch( $string ) {
- wfProfileIn( __METHOD__ );
# MySQL fulltext index doesn't grok utf-8, so we
# need to fold cases and convert to hex
@@ -54,7 +53,6 @@ class LanguageBe_tarask extends Language {
$s = parent::normalizeForSearch( $s );
- wfProfileOut( __METHOD__ );
return $s;
}
diff --git a/languages/classes/LanguageJa.php b/languages/classes/LanguageJa.php
index 043b1554..bf3e167d 100644
--- a/languages/classes/LanguageJa.php
+++ b/languages/classes/LanguageJa.php
@@ -51,7 +51,7 @@ class LanguageJa extends Language {
/**
* Italic is not appropriate for Japanese script
- * Unfortunately most browsers do not recognise this, and render <em> as italic
+ * Unfortunately most browsers do not recognise this, and render `<em>` as italic
*
* @param string $text
* @return string
diff --git a/languages/classes/LanguageKk.php b/languages/classes/LanguageKk.php
index 1a098180..b8af885d 100644
--- a/languages/classes/LanguageKk.php
+++ b/languages/classes/LanguageKk.php
@@ -279,27 +279,22 @@ class KkConverter extends LanguageConverter {
* @return string
*/
function translate( $text, $toVariant ) {
- global $wgLanguageCode;
$text = parent::translate( $text, $toVariant );
switch ( $toVariant ) {
case 'kk-cyrl':
case 'kk-kz':
$letters = KK_L_UC . KK_L_LC . 'ʺʹ#0123456789';
- $wgLanguageCode = 'kk';
break;
case 'kk-latn':
case 'kk-tr':
$letters = KK_C_UC . KK_C_LC . '№0123456789';
- $wgLanguageCode = 'kk-Latn';
break;
case 'kk-arab':
case 'kk-cn':
$letters = KK_C_UC . KK_C_LC . /*KK_L_UC.KK_L_LC.'ʺʹ'.*/',;\?%\*№0123456789';
- $wgLanguageCode = 'kk-Arab';
break;
default:
- $wgLanguageCode = 'kk';
return $text;
}
// disable conversion variables like $1, $2...
@@ -459,7 +454,6 @@ class LanguageKk extends LanguageKk_cyrl {
* @return string
*/
function convertGrammar( $word, $case ) {
- wfProfileIn( __METHOD__ );
$variant = $this->getPreferredVariant();
switch ( $variant ) {
@@ -478,7 +472,6 @@ class LanguageKk extends LanguageKk_cyrl {
$word = parent::convertGrammarKk_cyrl( $word, $case );
}
- wfProfileOut( __METHOD__ );
return $word;
}
}
diff --git a/languages/classes/LanguageQqx.php b/languages/classes/LanguageQqx.php
index 1ee398de..353b59a3 100644
--- a/languages/classes/LanguageQqx.php
+++ b/languages/classes/LanguageQqx.php
@@ -26,7 +26,7 @@
* This does not affect untranslated messages.
*
* NOTE: It returns a valid title, because there are some poorly written
- * extentions that assume the contents of some messages are valid.
+ * extensions that assume the contents of some messages are valid.
*
* @ingroup Language
*/
diff --git a/languages/classes/LanguageYue.php b/languages/classes/LanguageYue.php
index 3293cc64..d5f3e760 100644
--- a/languages/classes/LanguageYue.php
+++ b/languages/classes/LanguageYue.php
@@ -54,14 +54,12 @@ class LanguageYue extends Language {
* @return string
*/
function normalizeForSearch( $string ) {
- wfProfileIn( __METHOD__ );
// Double-width roman characters
$s = self::convertDoubleWidth( $string );
$s = trim( $s );
$s = parent::normalizeForSearch( $s );
- wfProfileOut( __METHOD__ );
return $s;
}
}
diff --git a/languages/classes/LanguageZh.php b/languages/classes/LanguageZh.php
index 67f8769b..0f47c38b 100644
--- a/languages/classes/LanguageZh.php
+++ b/languages/classes/LanguageZh.php
@@ -67,23 +67,35 @@ class ZhConverter extends LanguageConverter {
$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-cn' => new ReplacementArray( $zh2CN ),
+ 'zh-hk' => new ReplacementArray( $zh2HK ),
+ 'zh-mo' => new ReplacementArray( $zh2HK ),
+ 'zh-my' => new ReplacementArray( $zh2CN ),
+ 'zh-sg' => new ReplacementArray( $zh2CN ),
+ 'zh-tw' => new ReplacementArray( $zh2TW ),
'zh' => new ReplacementArray
);
}
function postLoadTables() {
- $this->mTables['zh-cn']->merge( $this->mTables['zh-hans'] );
- $this->mTables['zh-hk']->merge( $this->mTables['zh-hant'] );
- $this->mTables['zh-mo']->merge( $this->mTables['zh-hant'] );
- $this->mTables['zh-my']->merge( $this->mTables['zh-hans'] );
- $this->mTables['zh-sg']->merge( $this->mTables['zh-hans'] );
- $this->mTables['zh-tw']->merge( $this->mTables['zh-hant'] );
+ $this->mTables['zh-cn']->setArray(
+ $this->mTables['zh-cn']->getArray() + $this->mTables['zh-hans']->getArray()
+ );
+ $this->mTables['zh-hk']->setArray(
+ $this->mTables['zh-hk']->getArray() + $this->mTables['zh-hant']->getArray()
+ );
+ $this->mTables['zh-mo']->setArray(
+ $this->mTables['zh-mo']->getArray() + $this->mTables['zh-hant']->getArray()
+ );
+ $this->mTables['zh-my']->setArray(
+ $this->mTables['zh-my']->getArray() + $this->mTables['zh-hans']->getArray()
+ );
+ $this->mTables['zh-sg']->setArray(
+ $this->mTables['zh-sg']->getArray() + $this->mTables['zh-hans']->getArray()
+ );
+ $this->mTables['zh-tw']->setArray(
+ $this->mTables['zh-tw']->getArray() + $this->mTables['zh-hant']->getArray()
+ );
}
/**
@@ -170,7 +182,6 @@ class LanguageZh extends LanguageZh_hans {
* @return string
*/
function normalizeForSearch( $string, $autoVariant = 'zh-hans' ) {
- wfProfileIn( __METHOD__ );
// always convert to zh-hans before indexing. it should be
// better to use zh-hans for search, since conversion from
@@ -179,7 +190,6 @@ class LanguageZh extends LanguageZh_hans {
$s = $this->mConverter->autoConvert( $string, $autoVariant );
// LanguageZh_hans::normalizeForSearch
$s = parent::normalizeForSearch( $s );
- wfProfileOut( __METHOD__ );
return $s;
}
diff --git a/languages/classes/LanguageZh_hans.php b/languages/classes/LanguageZh_hans.php
index 6483d90b..75a05fde 100644
--- a/languages/classes/LanguageZh_hans.php
+++ b/languages/classes/LanguageZh_hans.php
@@ -56,14 +56,12 @@ class LanguageZh_hans extends Language {
* @return string
*/
function normalizeForSearch( $s ) {
- wfProfileIn( __METHOD__ );
// Double-width roman characters
$s = parent::normalizeForSearch( $s );
$s = trim( $s );
$s = $this->segmentByWord( $s );
- wfProfileOut( __METHOD__ );
return $s;
}
generated by cgit v1.2.2 (git 2.25.0) at 2024-04-20 08:11:23 +0000