From f8f150a9d7d16f16ade4388c09da378802a7a455 Mon Sep 17 00:00:00 2001 From: Rotem Liss Date: Sat, 24 Jun 2006 18:48:58 +0000 Subject: [PATCH] Using __construct for all the language constructors, and few minor fixes. --- languages/Language.php | 2 +- languages/LanguageAf.php | 4 ++-- languages/LanguageAn.php | 4 ++-- languages/LanguageAst.php | 4 ++-- languages/LanguageAz.php | 4 ++-- languages/LanguageBe.php | 4 ++-- languages/LanguageCa.php | 4 ++-- languages/LanguageConverter.php | 2 +- languages/LanguageFi.php | 4 ++-- languages/LanguageGsw.php | 4 ++-- languages/LanguageHe.php | 2 +- languages/LanguageIa.php | 4 ++-- languages/LanguageJa.php | 4 ++-- languages/LanguageLa.php | 4 ++-- languages/LanguageNl.php | 4 ++-- languages/LanguageOs.php | 6 ------ languages/LanguageRmy.php | 4 ++-- languages/LanguageRo.php | 4 ++-- languages/LanguageRu.php | 4 ++-- languages/LanguageSk.php | 4 ++-- languages/LanguageSq.php | 4 ++-- languages/LanguageSr.php | 2 +- languages/LanguageSv.php | 4 ++-- languages/LanguageTyv.php | 4 ++-- languages/LanguageWa.php | 4 ++-- languages/LanguageXal.php | 6 ------ languages/LanguageZh.php | 2 +- 27 files changed, 45 insertions(+), 57 deletions(-) diff --git a/languages/Language.php b/languages/Language.php index c615f8b522..85a6bce755 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -322,7 +322,7 @@ class fakeConverter { class Language { var $mConverter; - function Language() { + function __construct() { $this->mConverter = new fakeConverter($this); } diff --git a/languages/LanguageAf.php b/languages/LanguageAf.php index 14414d423d..db04fae9d7 100644 --- a/languages/LanguageAf.php +++ b/languages/LanguageAf.php @@ -24,8 +24,8 @@ class LanguageAf extends LanguageUtf8 { 'cologneblue' => "Keulen blou", ); - function LanguageAf() { - LanguageUtf8::LanguageUtf8(); + function __construct() { + parent::__construct(); global $wgAllMessagesAf; $this->mMessagesAf =& $wgAllMessagesAf; diff --git a/languages/LanguageAn.php b/languages/LanguageAn.php index b84209a774..5ba3145775 100644 --- a/languages/LanguageAn.php +++ b/languages/LanguageAn.php @@ -10,8 +10,8 @@ require_once( "LanguageUtf8.php" ); class LanguageAn extends LanguageUtf8 { private $mNamespaceNamesAn = null; - function LanguageAn() { - LanguageUtf8::LanguageUtf8(); + function __construct() { + parent::__construct(); global $wgMetaNamespace; $this->mNamespaceNamesAn = array( diff --git a/languages/LanguageAst.php b/languages/LanguageAst.php index f0e3871cbb..698dd26fe2 100644 --- a/languages/LanguageAst.php +++ b/languages/LanguageAst.php @@ -10,8 +10,8 @@ require_once( 'LanguageUtf8.php' ); class LanguageAst extends LanguageUtf8 { private $mNamespaceNamesAst = null; - function LanguageAst() { - LanguageUtf8::LanguageUtf8(); + function __construct() { + parent::__construct(); global $wgMetaNamespace; $this->mNamespaceNamesAst = array( diff --git a/languages/LanguageAz.php b/languages/LanguageAz.php index bb7da3dbfe..1dfc46ca9a 100644 --- a/languages/LanguageAz.php +++ b/languages/LanguageAz.php @@ -22,8 +22,8 @@ class LanguageAz extends LanguageUtf8 { MW_DATE_ISO => '2001-01-15 16:12:34' ); - function LanguageAz() { - LanguageUtf8::LanguageUtf8(); + function __construct() { + parent::__construct(); global $wgAllMessagesAz; $this->mMessagesAz =& $wgAllMessagesAz; diff --git a/languages/LanguageBe.php b/languages/LanguageBe.php index 934fb1e23c..e55b1e7ac6 100644 --- a/languages/LanguageBe.php +++ b/languages/LanguageBe.php @@ -120,8 +120,8 @@ class LanguageBe extends LanguageUtf8 { MAG_URLENCODE => array( 0, 'URLENCODE:' ), ); - function LanguageBe() { - LanguageUtf8::LanguageUtf8(); + function __construct() { + parent::__construct(); global $wgAllMessagesBe; $this->mMessagesBe =& $wgAllMessagesBe; diff --git a/languages/LanguageCa.php b/languages/LanguageCa.php index 10c4053def..caa86ed583 100644 --- a/languages/LanguageCa.php +++ b/languages/LanguageCa.php @@ -29,8 +29,8 @@ class LanguageCa extends LanguageUtf8 { 'Totselsllibres.com' => 'http://www.totselsllibres.com/tel/publi/busquedaAvanzadaLibros.do?ISBN=$1', ); - function LanguageCa() { - LanguageUtf8::LanguageUtf8(); + function __construct() { + parent::__construct(); global $wgAllMessagesCa; $this->mMessagesCa =& $wgAllMessagesCa; diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php index 53cf67e932..9bb6715a76 100644 --- a/languages/LanguageConverter.php +++ b/languages/LanguageConverter.php @@ -30,7 +30,7 @@ class LanguageConverter { * @param array $flags array defining the custom strings that maps to the flags * @access public */ - function LanguageConverter($langobj, $maincode, + function __construct($langobj, $maincode, $variants=array(), $variantfallbacks=array(), $markup=array(), diff --git a/languages/LanguageFi.php b/languages/LanguageFi.php index ed067dde6f..7f075713fa 100644 --- a/languages/LanguageFi.php +++ b/languages/LanguageFi.php @@ -41,8 +41,8 @@ class LanguageFi extends LanguageUtf8 { 'Tampereen seudun kirjastot' => 'http://kirjasto.tampere.fi/Piki?formid=fullt&typ0=6&dat0=$1' ); - function LanguageFi() { - LanguageUtf8::LanguageUtf8(); + function __construct() { + parent::__construct(); global $wgAllMessagesFi; $this->mMessagesFi =& $wgAllMessagesFi; diff --git a/languages/LanguageGsw.php b/languages/LanguageGsw.php index ee0fe3f113..72dd713bbd 100644 --- a/languages/LanguageGsw.php +++ b/languages/LanguageGsw.php @@ -24,8 +24,8 @@ if (!$wgCachedMessageArrays) { class LanguageGsw extends LanguageDe { private $mMessagesGsw = null; - function LanguageGsw() { - LanguageDe::LanguageDe(); + function __construct() { + parent::__construct(); global $wgAllMessagesGsw; $this->mMessagesGsw =& $wgAllMessagesGsw; diff --git a/languages/LanguageHe.php b/languages/LanguageHe.php index e5e2dd9ef8..1a5e23a3f8 100644 --- a/languages/LanguageHe.php +++ b/languages/LanguageHe.php @@ -131,7 +131,7 @@ class LanguageHe extends LanguageUtf8 { * Constructor, setting the namespaces */ function __construct() { - LanguageUtf8::LanguageUtf8(); + parent::__construct(); global $wgAllMessagesHe; $this->mMessagesHe = &$wgAllMessagesHe; diff --git a/languages/LanguageIa.php b/languages/LanguageIa.php index 29a0f869c9..01b201c7ab 100644 --- a/languages/LanguageIa.php +++ b/languages/LanguageIa.php @@ -23,8 +23,8 @@ class LanguageIa extends LanguageUtf8 { ); - function LanguageIa() { - LanguageUtf8::LanguageUtf8(); + function __construct() { + parent::__construct(); global $wgAllMessagesIa; $this->mMessagesIa =& $wgAllMessagesIa; diff --git a/languages/LanguageJa.php b/languages/LanguageJa.php index d6e6624f71..1379c683d1 100644 --- a/languages/LanguageJa.php +++ b/languages/LanguageJa.php @@ -34,8 +34,8 @@ class LanguageJa extends LanguageUtf8 { "日", "月", "火", "水", "木", "金", "土" ); - function LanguageJa() { - LanguageUtf8::LanguageUtf8(); + function __construct() { + parent::__construct(); global $wgAllMessagesJa; $this->mMessagesJa =& $wgAllMessagesJa; diff --git a/languages/LanguageLa.php b/languages/LanguageLa.php index ff84bd3fdf..0e783ad4c4 100644 --- a/languages/LanguageLa.php +++ b/languages/LanguageLa.php @@ -22,8 +22,8 @@ class LanguageLa extends LanguageUtf8 { 'cologneblue' => 'Caerulus Colonia' ); - function LanguageLa() { - LanguageUtf8::LanguageUtf8(); + function __construct() { + parent::__construct(); global $wgAllMessagesLa; $this->mMessagesLa =& $wgAllMessagesLa; diff --git a/languages/LanguageNl.php b/languages/LanguageNl.php index d68ca96394..a7d59c2d3c 100644 --- a/languages/LanguageNl.php +++ b/languages/LanguageNl.php @@ -24,8 +24,8 @@ class LanguageNl extends LanguageUtf8 { 'cologneblue' => 'Keuls blauw', ); - function LanguageNl() { - LanguageUtf8::LanguageUtf8(); + function __construct() { + parent::__construct(); global $wgAllMessagesNl; $this->mMessagesNl =& $wgAllMessagesNl; diff --git a/languages/LanguageOs.php b/languages/LanguageOs.php index ff09668f4f..908f12b990 100644 --- a/languages/LanguageOs.php +++ b/languages/LanguageOs.php @@ -49,12 +49,6 @@ if (!$wgCachedMessageArrays) { } class LanguageOs extends LanguageRu { - function LanguageOs() { - # FIXME: Are the globals really used ? - global $wgNamespaceNamesOs, $wgMetaNamespace; - LanguageUtf8::LanguageUtf8(); - } - function getNamespaces() { global $wgNamespaceNamesOs; return $wgNamespaceNamesOs; diff --git a/languages/LanguageRmy.php b/languages/LanguageRmy.php index 5efab670c6..f4b9583d58 100644 --- a/languages/LanguageRmy.php +++ b/languages/LanguageRmy.php @@ -24,8 +24,8 @@ if (!$wgCachedMessageArrays) { class LanguageRmy extends LanguageRo { private $mMessagesRmy = null; - function LanguageRmy() { - parent::LanguageRo(); + function __construct() { + parent::__construct(); global $wgAllMessagesRmy; $this->mMessagesRmy =& $wgAllMessagesRmy; diff --git a/languages/LanguageRo.php b/languages/LanguageRo.php index 3aeb24a3cf..1cac3d02cd 100644 --- a/languages/LanguageRo.php +++ b/languages/LanguageRo.php @@ -50,8 +50,8 @@ class LanguageRo extends LanguageUtf8 { ); - function LanguageRo() { - LanguageUtf8::LanguageUtf8(); + function __construct() { + parent::__construct(); global $wgAllMessagesRo; $this->mMessagesRo =& $wgAllMessagesRo; diff --git a/languages/LanguageRu.php b/languages/LanguageRu.php index aceda29c01..4b1b385fb8 100644 --- a/languages/LanguageRu.php +++ b/languages/LanguageRu.php @@ -116,9 +116,9 @@ if (!$wgCachedMessageArrays) { /* Please, see Language.php for general function comments */ class LanguageRu extends LanguageUtf8 { - function LanguageRu() { + function __construct() { global $wgNamespaceNamesRu, $wgMetaNamespace; - LanguageUtf8::LanguageUtf8(); + parent::__construct(); $wgNamespaceNamesRu[NS_PROJECT_TALK] = 'Обсуждение_' . $this->convertGrammar( $wgMetaNamespace, 'genitive' ); } diff --git a/languages/LanguageSk.php b/languages/LanguageSk.php index de2844a027..be50900048 100644 --- a/languages/LanguageSk.php +++ b/languages/LanguageSk.php @@ -88,8 +88,8 @@ class LanguageSk extends LanguageUtf8 { MAG_REVISIONID => array( 1, 'REVISIONID' ), ); - function LanguageSk() { - LanguageUtf8::LanguageUtf8(); + function __construct() { + parent::__construct(); global $wgAllMessagesSk; $this->mMessagesSk =& $wgAllMessagesSk; diff --git a/languages/LanguageSq.php b/languages/LanguageSq.php index fad3736d08..3ec5734fb9 100644 --- a/languages/LanguageSq.php +++ b/languages/LanguageSq.php @@ -30,8 +30,8 @@ class LanguageSq extends LanguageUtf8 { MW_DATE_ISO => '2001-01-15 16:12:34' ); - function LanguageSq() { - LanguageUtf8::LanguageUtf8(); + function __construct() { + parent::__construct(); global $wgAllMessagesSq; $this->mMessagesSq =& $wgAllMessagesSq; diff --git a/languages/LanguageSr.php b/languages/LanguageSr.php index fa2b95b688..ffbb678476 100644 --- a/languages/LanguageSr.php +++ b/languages/LanguageSr.php @@ -194,7 +194,7 @@ class SrConverter extends LanguageConverter { } class LanguageSr extends LanguageSr_ec { - function LanguageSr() { + function __construct() { global $wgHooks; $variants = array('sr', 'sr-ec', 'sr-jc', 'sr-el', 'sr-jl'); $variantfallbacks = array( diff --git a/languages/LanguageSv.php b/languages/LanguageSv.php index 305212b959..4abb1e03b2 100644 --- a/languages/LanguageSv.php +++ b/languages/LanguageSv.php @@ -28,8 +28,8 @@ class LanguageSv extends LanguageUtf8 { 'cologneblue' => "Cologne Blå", ); - function LanguageSv() { - LanguageUtf8::LanguageUtf8(); + function __construct() { + parent::__construct(); global $wgAllMessagesSv; $this->mMessagesSv =& $wgAllMessagesSv; diff --git a/languages/LanguageTyv.php b/languages/LanguageTyv.php index 9ae23b0458..1c7abe0b3f 100644 --- a/languages/LanguageTyv.php +++ b/languages/LanguageTyv.php @@ -65,9 +65,9 @@ if (!$wgCachedMessageArrays) { #-------------------------------------------------------------------------- class LanguageTyv extends LanguageUtf8 { - function LanguageTyv() { + function __construct() { global $wgNamespaceNamesTyv, $wgMetaNamespace; - LanguageUtf8::LanguageUtf8(); + parent::__construct(); $wgNamespaceNamesTyv[NS_PROJECT_TALK] = $wgMetaNamespace . '_чугаа'; } diff --git a/languages/LanguageWa.php b/languages/LanguageWa.php index 422897f0fe..55c2e45f94 100644 --- a/languages/LanguageWa.php +++ b/languages/LanguageWa.php @@ -41,8 +41,8 @@ class LanguageWa extends LanguageUtf8 { - function LanguageWa() { - LanguageUtf8::LanguageUtf8(); + function __construct() { + parent::__construct(); global $wgAllMessagesWa; $this->mMessagesWa =& $wgAllMessagesWa; diff --git a/languages/LanguageXal.php b/languages/LanguageXal.php index 82f45c3c51..1a32106909 100644 --- a/languages/LanguageXal.php +++ b/languages/LanguageXal.php @@ -33,12 +33,6 @@ if (!$wgCachedMessageArrays) { } class LanguageXal extends LanguageUtf8 { - function LanguageXal() { - # FIXME are the globas really used? - global $wgNamespaceNamesXal, $wgMetaNamespace; - LanguageUtf8::LanguageUtf8(); - } - function getNamespaces() { global $wgNamespaceNamesXal; return $wgNamespaceNamesXal; diff --git a/languages/LanguageZh.php b/languages/LanguageZh.php index f2052eef6c..b24c08e6ae 100644 --- a/languages/LanguageZh.php +++ b/languages/LanguageZh.php @@ -43,7 +43,7 @@ class ZhConverter extends LanguageConverter { */ class LanguageZh extends LanguageZh_cn { - function LanguageZh() { + function __construct() { global $wgHooks; $this->mConverter = new ZhConverter($this, 'zh', array('zh', 'zh-cn', 'zh-tw', 'zh-sg', 'zh-hk'), -- 2.20.1