From 63601400e476c6cf43d985f3e7b9864681695ed4 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Fri, 18 Jan 2013 16:46:04 +0100 Subject: Update to MediaWiki 1.20.2 this update includes: * adjusted Arch Linux skin * updated FluxBBAuthPlugin * patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024 --- languages/classes/LanguageAm.php | 22 ----- languages/classes/LanguageAr.php | 51 ++++++------ languages/classes/LanguageAz.php | 31 +++++++- languages/classes/LanguageBe.php | 41 ---------- languages/classes/LanguageBe_tarask.php | 39 ++++++--- languages/classes/LanguageBg.php | 24 +++++- languages/classes/LanguageBh.php | 22 ----- languages/classes/LanguageBs.php | 47 ++++++----- languages/classes/LanguageCs.php | 34 -------- languages/classes/LanguageCu.php | 24 +++++- languages/classes/LanguageCy.php | 28 ------- languages/classes/LanguageDsb.php | 42 +++++----- languages/classes/LanguageEo.php | 26 +++++- languages/classes/LanguageEt.php | 25 +++++- languages/classes/LanguageFi.php | 27 ++++++- languages/classes/LanguageFr.php | 22 ----- languages/classes/LanguageGa.php | 44 +++++----- languages/classes/LanguageGan.php | 27 ++++++- languages/classes/LanguageGd.php | 46 ----------- languages/classes/LanguageGv.php | 27 ++++++- languages/classes/LanguageHe.php | 43 +++++----- languages/classes/LanguageHi.php | 22 +++++ languages/classes/LanguageHr.php | 30 ++++++- languages/classes/LanguageHsb.php | 41 +++++----- languages/classes/LanguageHu.php | 24 +++++- languages/classes/LanguageHy.php | 26 +++++- languages/classes/LanguageIu.deps.php | 8 -- languages/classes/LanguageIu.php | 47 +++++++---- languages/classes/LanguageJa.php | 21 +++++ languages/classes/LanguageKaa.php | 28 ++++++- languages/classes/LanguageKk.deps.php | 9 --- languages/classes/LanguageKk.php | 47 ++++++----- languages/classes/LanguageKk_cyrl.php | 24 +++++- languages/classes/LanguageKm.php | 26 +++++- languages/classes/LanguageKsh.php | 27 ++++++- languages/classes/LanguageKu.deps.php | 9 --- languages/classes/LanguageKu.php | 30 ++++++- languages/classes/LanguageKu_ku.php | 24 +++++- languages/classes/LanguageLa.php | 24 +++++- languages/classes/LanguageLn.php | 22 +++++ languages/classes/LanguageLt.php | 24 +++++- languages/classes/LanguageLv.php | 28 ++++++- languages/classes/LanguageMg.php | 22 +++++ languages/classes/LanguageMk.php | 22 +++++ languages/classes/LanguageMl.php | 21 +++++ languages/classes/LanguageMo.php | 22 +++++ languages/classes/LanguageMt.php | 28 ++++++- languages/classes/LanguageMy.php | 29 ++++++- languages/classes/LanguageNso.php | 22 +++++ languages/classes/LanguageOs.php | 25 +++++- languages/classes/LanguagePl.php | 32 +++++++- languages/classes/LanguageQqx.php | 22 +++++ languages/classes/LanguageRo.php | 22 +++++ languages/classes/LanguageRu.php | 34 ++++++-- languages/classes/LanguageSe.php | 22 +++++ languages/classes/LanguageSgs.php | 26 +++++- languages/classes/LanguageSh.php | 22 +++++ languages/classes/LanguageShi.deps.php | 8 -- languages/classes/LanguageShi.php | 47 +++++++---- languages/classes/LanguageSk.php | 22 +++++ languages/classes/LanguageSl.php | 24 +++++- languages/classes/LanguageSma.php | 22 +++++ languages/classes/LanguageSr.deps.php | 9 --- languages/classes/LanguageSr.php | 28 ++++++- languages/classes/LanguageSr_ec.php | 21 +++++ languages/classes/LanguageSr_el.php | 21 +++++ languages/classes/LanguageTg.php | 24 +++++- languages/classes/LanguageTi.php | 22 +++++ languages/classes/LanguageTl.php | 22 +++++ languages/classes/LanguageTr.php | 22 +++++ languages/classes/LanguageTyv.php | 25 +++++- languages/classes/LanguageUk.php | 24 +++++- languages/classes/LanguageUz.php | 137 ++++++++++++++++++++++++++++++++ languages/classes/LanguageWa.php | 33 ++++++-- languages/classes/LanguageYue.php | 22 +++++ languages/classes/LanguageZh.deps.php | 9 --- languages/classes/LanguageZh.php | 27 ++++++- languages/classes/LanguageZh_hans.php | 21 +++++ 78 files changed, 1654 insertions(+), 540 deletions(-) delete mode 100644 languages/classes/LanguageAm.php delete mode 100644 languages/classes/LanguageBe.php delete mode 100644 languages/classes/LanguageBh.php delete mode 100644 languages/classes/LanguageCs.php delete mode 100644 languages/classes/LanguageCy.php delete mode 100644 languages/classes/LanguageFr.php delete mode 100644 languages/classes/LanguageGd.php delete mode 100644 languages/classes/LanguageIu.deps.php delete mode 100644 languages/classes/LanguageKk.deps.php delete mode 100644 languages/classes/LanguageKu.deps.php delete mode 100644 languages/classes/LanguageShi.deps.php delete mode 100644 languages/classes/LanguageSr.deps.php create mode 100644 languages/classes/LanguageUz.php delete mode 100644 languages/classes/LanguageZh.deps.php (limited to 'languages/classes') diff --git a/languages/classes/LanguageAm.php b/languages/classes/LanguageAm.php deleted file mode 100644 index 29ae9c11..00000000 --- a/languages/classes/LanguageAm.php +++ /dev/null @@ -1,22 +0,0 @@ -preConvertPlural( $forms, 2 ); - - return ( $count <= 1 ) ? $forms[0] : $forms[1]; - } -} diff --git a/languages/classes/LanguageAr.php b/languages/classes/LanguageAr.php index 95e76392..553ff077 100644 --- a/languages/classes/LanguageAr.php +++ b/languages/classes/LanguageAr.php @@ -1,36 +1,33 @@ preConvertPlural( $forms, 6 ); - - if ( $count == 0 ) { - $index = 0; - } elseif ( $count == 1 ) { - $index = 1; - } elseif ( $count == 2 ) { - $index = 2; - } elseif ( $count % 100 >= 3 && $count % 100 <= 10 ) { - $index = 3; - } elseif ( $count % 100 >= 11 && $count % 100 <= 99 ) { - $index = 4; - } else { - $index = 5; - } - return $forms[$index]; - } +/** + * Arabic (العربية) + * + * @ingroup Language + */ +class LanguageAr extends Language { /** * Temporary hack for bug 9413: replace Arabic presentation forms with their diff --git a/languages/classes/LanguageAz.php b/languages/classes/LanguageAz.php index 947e6560..0956dc42 100644 --- a/languages/classes/LanguageAz.php +++ b/languages/classes/LanguageAz.php @@ -1,8 +1,31 @@ - * @see http://be.wikipedia.org/wiki/Talk:LanguageBe.php - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License - * @license http://www.gnu.org/copyleft/fdl.html GNU Free Documentation License - */ - -class LanguageBe extends Language { - - /** - * @param $count int - * @param $forms array - * - * @return string - */ - function convertPlural( $count, $forms ) { - if ( !count( $forms ) ) { return ''; } - // @todo FIXME: CLDR defines 4 plural forms instead of 3 - // http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html - $forms = $this->preConvertPlural( $forms, 3 ); - - if ( $count > 10 && floor( ( $count % 100 ) / 10 ) == 1 ) { - return $forms[2]; - } else { - switch ( $count % 10 ) { - case 1: return $forms[0]; - case 2: - case 3: - case 4: return $forms[1]; - default: return $forms[2]; - } - } - } -} diff --git a/languages/classes/LanguageBe_tarask.php b/languages/classes/LanguageBe_tarask.php index 0e07a71c..b781d7a6 100644 --- a/languages/classes/LanguageBe_tarask.php +++ b/languages/classes/LanguageBe_tarask.php @@ -1,14 +1,35 @@ - * @see http://be-x-old.wikipedia.org/wiki/Project_talk:LanguageBe_tarask.php - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License - * @license http://www.gnu.org/copyleft/fdl.html GNU Free Documentation License - */ +/** + * Belarusian in Taraškievica orthography (Беларуская тарашкевіца) specific code. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * http://www.gnu.org/copyleft/gpl.html + * + * @file + * @author Ævar Arnfjörð Bjarmason + * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License + * @license http://www.gnu.org/copyleft/fdl.html GNU Free Documentation License + * @ingroup Language + */ +/** + * Belarusian in Taraškievica orthography (Беларуская тарашкевіца) + * + * @ingroup Language + * @see http://be-x-old.wikipedia.org/wiki/Project_talk:LanguageBe_tarask.php + */ class LanguageBe_tarask extends Language { /** * Plural form transformations diff --git a/languages/classes/LanguageBg.php b/languages/classes/LanguageBg.php index 9ccb9a85..d735c7a0 100644 --- a/languages/classes/LanguageBg.php +++ b/languages/classes/LanguageBg.php @@ -1,6 +1,28 @@ preConvertPlural( $forms, 2 ); - - return ( $count <= 1 ) ? $forms[0] : $forms[1]; - } -} diff --git a/languages/classes/LanguageBs.php b/languages/classes/LanguageBs.php index 7c13037e..3da7711e 100644 --- a/languages/classes/LanguageBs.php +++ b/languages/classes/LanguageBs.php @@ -1,34 +1,33 @@ preConvertPlural( $forms, 3 ); - - // @todo FIXME: CLDR defines 4 plural forms instead of 3. Plural for decimals is missing. - // http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html - if ( $count > 10 && floor( ( $count % 100 ) / 10 ) == 1 ) { - return $forms[2]; - } else { - switch ( $count % 10 ) { - case 1: return $forms[0]; - case 2: - case 3: - case 4: return $forms[1]; - default: return $forms[2]; - } - } - } /** * Convert from the nominative form of a noun to some other case diff --git a/languages/classes/LanguageCs.php b/languages/classes/LanguageCs.php deleted file mode 100644 index f50a7e70..00000000 --- a/languages/classes/LanguageCs.php +++ /dev/null @@ -1,34 +0,0 @@ -preConvertPlural( $forms, 3 ); - - switch ( $count ) { - case 1: - return $forms[0]; - case 2: - case 3: - case 4: - return $forms[1]; - default: - return $forms[2]; - } - } -} diff --git a/languages/classes/LanguageCu.php b/languages/classes/LanguageCu.php index af42d2c2..2016a43c 100644 --- a/languages/classes/LanguageCu.php +++ b/languages/classes/LanguageCu.php @@ -1,6 +1,28 @@ preConvertPlural( $forms, 6 ); - $count = abs( $count ); - if ( $count >= 0 && $count <= 3 ) { - return $forms[$count]; - } elseif ( $count == 6 ) { - return $forms[4]; - } else { - return $forms[5]; - } - } -} diff --git a/languages/classes/LanguageDsb.php b/languages/classes/LanguageDsb.php index 1fae25cf..975157f4 100644 --- a/languages/classes/LanguageDsb.php +++ b/languages/classes/LanguageDsb.php @@ -1,6 +1,29 @@ preConvertPlural( $forms, 4 ); - - switch ( abs( $count ) % 100 ) { - case 1: return $forms[0]; // singular - case 2: return $forms[1]; // dual - case 3: - case 4: return $forms[2]; // plural - default: return $forms[3]; // pluralgen - } - } } diff --git a/languages/classes/LanguageEo.php b/languages/classes/LanguageEo.php index af058a3e..3c162480 100644 --- a/languages/classes/LanguageEo.php +++ b/languages/classes/LanguageEo.php @@ -1,9 +1,31 @@ + * @ingroup Language + */ -/** Esperanto (Esperanto) +/** + * Esperanto (Esperanto) * * @ingroup Language - * @author Brion Vibber */ class LanguageEo extends Language { /** diff --git a/languages/classes/LanguageEt.php b/languages/classes/LanguageEt.php index b469dec9..1a9f286f 100644 --- a/languages/classes/LanguageEt.php +++ b/languages/classes/LanguageEt.php @@ -1,9 +1,30 @@ preConvertPlural( $forms, 2 ); - - return ( $count <= 1 ) ? $forms[0] : $forms[1]; - } -} diff --git a/languages/classes/LanguageGa.php b/languages/classes/LanguageGa.php index 43050e16..2f58384a 100644 --- a/languages/classes/LanguageGa.php +++ b/languages/classes/LanguageGa.php @@ -1,6 +1,28 @@ preConvertPlural( $forms, 3 ); - - if ( $count == 1 ) { - $index = 0; - } elseif ( $count == 2 ) { - $index = 1; - } else { - $index = 2; - } - return $forms[$index]; - } } diff --git a/languages/classes/LanguageGan.php b/languages/classes/LanguageGan.php index 99b4c29e..14fe9282 100644 --- a/languages/classes/LanguageGan.php +++ b/languages/classes/LanguageGan.php @@ -1,7 +1,28 @@ mTables = array( 'gan-hans' => new ReplacementArray( $zh2Hans ), 'gan-hant' => new ReplacementArray( $zh2Hant ), diff --git a/languages/classes/LanguageGd.php b/languages/classes/LanguageGd.php deleted file mode 100644 index 737cddae..00000000 --- a/languages/classes/LanguageGd.php +++ /dev/null @@ -1,46 +0,0 @@ -preConvertPlural( $forms, 6 ); - - $count = abs( $count ); - if ( $count == 1 ) { - return $forms[0]; - } elseif ( $count == 2 ) { - return $forms[1]; - } elseif ( $count == 11 ) { - return $forms[2]; - } elseif ( $count == 12 ) { - return $forms[3]; - } elseif ( ($count >= 3 && $count <= 10) || ($count >= 13 && $count <= 19) ) { - return $forms[4]; - } else { - return $forms[5]; - } - } -} diff --git a/languages/classes/LanguageGv.php b/languages/classes/LanguageGv.php index 4defffda..70b80ad6 100644 --- a/languages/classes/LanguageGv.php +++ b/languages/classes/LanguageGv.php @@ -1,10 +1,31 @@ preConvertPlural( $forms, 3 ); - - if ( $count == 1 ) { - return $forms[0]; // Singular - } elseif ( $count == 2 ) { - return $forms[2]; // Dual or plural if dual is not provided (filled in preConvertPlural) - } else { - return $forms[1]; // Plural - } - } } diff --git a/languages/classes/LanguageHi.php b/languages/classes/LanguageHi.php index 53a0fc18..6a2302c0 100644 --- a/languages/classes/LanguageHi.php +++ b/languages/classes/LanguageHi.php @@ -1,4 +1,26 @@ preConvertPlural( $forms, 4 ); - - switch ( abs( $count ) % 100 ) { - case 1: return $forms[0]; // singular - case 2: return $forms[1]; // dual - case 3: - case 4: return $forms[2]; // plural - default: return $forms[3]; // pluralgen - } - } } diff --git a/languages/classes/LanguageHu.php b/languages/classes/LanguageHu.php index dbb6f5bb..1f4d45c0 100644 --- a/languages/classes/LanguageHu.php +++ b/languages/classes/LanguageHu.php @@ -1,6 +1,28 @@ lowercase Latin -* - lowercase/uppercase Latin -> Syllabics -* -* -* Based on: -* - http://commons.wikimedia.org/wiki/Image:Inuktitut.png -* - LanguageSr.php -* -* @ingroup Language -*/ -require_once( dirname( __FILE__ ) . '/../LanguageConverter.php' ); + * Inuktitut specific code. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * http://www.gnu.org/copyleft/gpl.html + * + * @file + * @ingroup Language + */ + +require_once( __DIR__ . '/../LanguageConverter.php' ); /** + * Conversion script between Latin and Syllabics for Inuktitut. + * - Syllabics -> lowercase Latin + * - lowercase/uppercase Latin -> Syllabics + * * + * Based on: + * - http://commons.wikimedia.org/wiki/Image:Inuktitut.png + * - LanguageSr.php + * + * @ingroup Language */ class IuConverter extends LanguageConverter { diff --git a/languages/classes/LanguageJa.php b/languages/classes/LanguageJa.php index 510a3976..9c6314c5 100644 --- a/languages/classes/LanguageJa.php +++ b/languages/classes/LanguageJa.php @@ -1,4 +1,25 @@ '№', # # Şç - '/ŞÇʹ/u' => 'ЩЬ', '/Şçʹ/u' => 'Щь', '/Şçʹ/u' => 'Щь', + '/ŞÇʹ/u' => 'ЩЬ', '/Şçʹ/u' => 'Щь', '/Ş[Çç]/u' => 'Щ', '/şç/u' => 'щ', # # soft and hard signs '/([' . KK_L_UC . '])ʺ([' . KK_L_UC . '])/u' => '$1Ъ$2', @@ -422,20 +443,6 @@ class LanguageKk extends LanguageKk_cyrl { $wgHooks['ArticleSaveComplete'][] = $this->mConverter; } - /** - * Work around for right-to-left direction support in kk-arab and kk-cn - * - * @return bool - */ - function isRTL() { - $variant = $this->getPreferredVariant(); - if ( $variant == 'kk-arab' || $variant == 'kk-cn' ) { - return true; - } else { - return parent::isRTL(); - } - } - /** * It fixes issue with ucfirst for transforming 'i' to 'İ' * diff --git a/languages/classes/LanguageKk_cyrl.php b/languages/classes/LanguageKk_cyrl.php index 30f74e6e..081a20f8 100644 --- a/languages/classes/LanguageKk_cyrl.php +++ b/languages/classes/LanguageKk_cyrl.php @@ -1,9 +1,31 @@ 'ه', 'j' => 'ژ', 'k' => 'ک', 'l' => 'ل', 'm' => 'م', 'n' => 'ن', 'p' => 'پ', 'q' => 'ق', 'r' => 'ر', 's' => 'س', 'ş' => 'ش', 't' => 'ت', 'v' => 'ڤ', - 'x' => 'خ', 'y' => 'ی', 'z' => 'ز', - + 'x' => 'خ', 'y' => 'ی', 'z' => 'ز', 'B' => 'ب', 'C' => 'ج', 'Ç' => 'چ', 'D' => 'د', 'F' => 'ف', 'G' => 'گ', 'H' => 'ھ', 'H' => 'ہ', 'H' => 'ه', 'H' => 'ح', 'J' => 'ژ', 'K' => 'ك', 'K' => 'ک', 'L' => 'ل', @@ -196,6 +217,7 @@ class KuConverter extends LanguageConverter { * @param $text string * @param $toVariant bool * + * @throws MWException * @return string */ function translate( $text, $toVariant ) { diff --git a/languages/classes/LanguageKu_ku.php b/languages/classes/LanguageKu_ku.php index e4332928..2381de53 100644 --- a/languages/classes/LanguageKu_ku.php +++ b/languages/classes/LanguageKu_ku.php @@ -1,6 +1,28 @@ preConvertPlural( $forms, 3 ); $count = abs( $count ); - if ( $count == 1 ) - return $forms[0]; // singular + if ( $count == 1 ) { + return $forms[0]; // singular + } switch ( $count % 10 ) { case 2: case 3: case 4: - if ( $count / 10 % 10 != 1 ) + if ( $count / 10 % 10 != 1 ) { return $forms[1]; // plural + } default: return $forms[2]; // plural genitive } diff --git a/languages/classes/LanguageQqx.php b/languages/classes/LanguageQqx.php index 6798b24c..8e2115c3 100644 --- a/languages/classes/LanguageQqx.php +++ b/languages/classes/LanguageQqx.php @@ -1,4 +1,26 @@ lowercase Latin -* - lowercase/uppercase Latin -> Tifinagh -* -* -* Based on: -* - http://en.wikipedia.org/wiki/Shilha_language -* - LanguageSr.php -* -* @ingroup Language -*/ -require_once( dirname( __FILE__ ) . '/../LanguageConverter.php' ); + * Shilha specific code. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * http://www.gnu.org/copyleft/gpl.html + * + * @file + * @ingroup Language + */ + +require_once( __DIR__ . '/../LanguageConverter.php' ); /** + * Conversion script between Latin and Tifinagh for Tachelhit. + * - Tifinagh -> lowercase Latin + * - lowercase/uppercase Latin -> Tifinagh + * * + * Based on: + * - http://en.wikipedia.org/wiki/Shilha_language + * - LanguageSr.php + * + * @ingroup Language */ class ShiConverter extends LanguageConverter { diff --git a/languages/classes/LanguageSk.php b/languages/classes/LanguageSk.php index eac25f4f..b1da70e6 100644 --- a/languages/classes/LanguageSk.php +++ b/languages/classes/LanguageSk.php @@ -1,4 +1,26 @@ 'a', 'А' => 'A', + 'б' => 'b', 'Б' => 'B', + 'д' => 'd', 'Д' => 'D', + 'е' => 'e', 'Е' => 'E', + 'э' => 'e', 'Э' => 'E', + 'в' => 'v', 'В' => 'V', + 'х' => 'x', 'Х' => 'X', + 'ғ' => 'gʻ', 'Ғ' => 'Gʻ', + 'г' => 'g', 'Г' => 'G', + 'ҳ' => 'h', 'Ҳ' => 'H', + 'ж' => 'j', 'Ж' => 'J', + 'з' => 'z', 'З' => 'Z', + 'и' => 'i', 'И' => 'I', + 'к' => 'k', 'К' => 'K', + 'л' => 'l', 'Л' => 'L', + 'м' => 'm', 'М' => 'M', + 'н' => 'n', 'Н' => 'N', + 'о' => 'o', 'О' => 'O', + 'п' => 'p', 'П' => 'P', + 'р' => 'r', 'Р' => 'R', + 'с' => 's', 'С' => 'S', + 'т' => 't', 'Т' => 'T', + 'у' => 'u', 'У' => 'U', + 'ф' => 'f', 'Ф' => 'F', + 'ц' => 'c', 'Ц' => 'C', + 'ў' => 'oʻ', 'Ў' => 'Oʻ', + 'ц' => 'ts', 'Ц' => 'Ts', // note: at the beginning of a word and right after a consonant, only "s" is used + 'қ' => 'q', 'Қ' => 'Q', + 'ё' => 'yo', 'Ё' => 'Yo', + 'ю' => 'yu', 'Ю' => 'Yu', + 'ч' => 'ch', 'Ч' => 'Ch', + 'ш' => 'sh', 'Ш' => 'Sh', + 'й' => 'y', 'Й' => 'Y', + 'я' => 'ya', 'Я' => 'Ya', + 'ъ' => 'ʼ', + ); + + var $toCyrillic = array( + 'a' => 'а', 'A' => 'А', + 'b' => 'б', 'B' => 'Б', + 'd' => 'д', 'D' => 'Д', + 'e' => 'е', 'E' => 'Е', + ' e' => ' э', ' E' => ' Э', // "э" is used at the beginning of a word instead of "e" + 'ye' => 'е', 'Ye' => 'Е', + 'f' => 'ф', 'F' => 'Ф', + 'g' => 'г', 'G' => 'Г', + 'g‘' => 'ғ', 'G‘' => 'Ғ', 'gʻ' => 'ғ', 'Gʻ' => 'Ғ', + 'h' => 'ҳ', 'H' => 'Ҳ', + 'i' => 'и', 'I' => 'И', + 'k' => 'к', 'K' => 'К', + 'l' => 'л', 'L' => 'Л', + 'm' => 'м', 'M' => 'М', + 'n' => 'н', 'N' => 'Н', + 'o' => 'о', 'O' => 'О', + 'p' => 'п', 'P' => 'П', + 'r' => 'р', 'R' => 'Р', + 's' => 'с', 'S' => 'С', + 't' => 'т', 'T' => 'Т', + 'u' => 'у', 'U' => 'У', + 'v' => 'в', 'V' => 'В', + 'x' => 'х', 'X' => 'Х', + 'z' => 'з', 'Z' => 'З', + 'j' => 'ж', 'J' => 'Ж', + 'o‘' => 'ў', 'O‘' => 'Ў', 'oʻ' => 'ў', 'Oʻ' => 'Ў', + 'yo‘' => 'йў', 'Yo‘' => 'Йў', 'yoʻ' => 'йў', 'Yoʻ' => 'Йў', + 'ts' => 'ц', 'Ts' => 'Ц', + 'q' => 'қ', 'Q' => 'Қ', + 'yo' => 'ё', 'Yo' => 'Ё', + 'yu' => 'ю', 'Yu' => 'Ю', + 'ch' => 'ч', 'Ch' => 'Ч', + 'sh' => 'ш', 'Sh' => 'Ш', + 'y' => 'й', 'Y' => 'Й', + 'ya' => 'я', 'Ya' => 'Я', + 'ʼ' => 'ъ', + ); + + function loadDefaultTables() { + $this->mTables = array( + 'uz-cyrl' => new ReplacementArray( $this->toCyrillic ), + 'uz-latn' => new ReplacementArray( $this->toLatin ), + 'uz' => new ReplacementArray() + ); + } + +} + +/** + * Uzbek + * + * @ingroup Language + */ +class LanguageUz extends Language { + function __construct() { + global $wgHooks; + parent::__construct(); + + $variants = array( 'uz', 'uz-latn', 'uz-cyrl' ); + $variantfallbacks = array( + 'uz' => 'uz-latn', + 'uz-cyrl' => 'uz', + 'uz-latn' => 'uz', + ); + + $this->mConverter = new UzConverter( $this, 'uz', $variants, $variantfallbacks ); + $wgHooks['ArticleSaveComplete'][] = $this->mConverter; + } +} diff --git a/languages/classes/LanguageWa.php b/languages/classes/LanguageWa.php index 4a186638..9e90c7f4 100644 --- a/languages/classes/LanguageWa.php +++ b/languages/classes/LanguageWa.php @@ -1,13 +1,34 @@ userAdjust( $ts, $tc ); } + if ( $adj ) { + $ts = $this->userAdjust( $ts, $tc ); + } $datePreference = $this->dateFormat( $format ); # ISO (YYYY-mm-dd) format diff --git a/languages/classes/LanguageYue.php b/languages/classes/LanguageYue.php index 5492529e..aef52151 100644 --- a/languages/classes/LanguageYue.php +++ b/languages/classes/LanguageYue.php @@ -1,4 +1,26 @@ mTables = array( 'zh-hans' => new ReplacementArray( $zh2Hans ), 'zh-hant' => new ReplacementArray( $zh2Hant ), diff --git a/languages/classes/LanguageZh_hans.php b/languages/classes/LanguageZh_hans.php index 671a16e7..d95c42ea 100644 --- a/languages/classes/LanguageZh_hans.php +++ b/languages/classes/LanguageZh_hans.php @@ -1,4 +1,25 @@