From 157a8106ac414689a1851d641e6847d3d157a490 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Wed, 4 Oct 2006 01:39:28 +0000 Subject: [PATCH] Restructured the languages directory, to avoid problems when people untar MW 1.8 over the top of a 1.7 installation. --- config/index.php | 4 +-- languages/Language.php | 27 ++++++++++++------- languages/{ => classes}/LanguageAz.php | 0 languages/{ => classes}/LanguageBe.php | 0 languages/{ => classes}/LanguageBg.php | 0 languages/{ => classes}/LanguageBs.php | 0 languages/{ => classes}/LanguageCs.php | 0 languages/{ => classes}/LanguageEo.php | 0 languages/{ => classes}/LanguageEt.php | 0 languages/{ => classes}/LanguageFi.php | 0 languages/{ => classes}/LanguageFr.php | 0 languages/{ => classes}/LanguageGa.php | 0 languages/{ => classes}/LanguageGsw.php | 0 languages/{ => classes}/LanguageHe.php | 0 languages/{ => classes}/LanguageHr.php | 0 languages/{ => classes}/LanguageHu.php | 0 languages/{ => classes}/LanguageJa.php | 0 languages/{ => classes}/LanguageKo.php | 0 languages/{ => classes}/LanguageKsh.php | 0 languages/{ => classes}/LanguageLa.php | 0 languages/{ => classes}/LanguageLt.php | 0 languages/{ => classes}/LanguageLv.php | 0 languages/{ => classes}/LanguagePt_br.php | 0 languages/{ => classes}/LanguageRmy.php | 0 languages/{ => classes}/LanguageRu.php | 0 languages/{ => classes}/LanguageSk.php | 0 languages/{ => classes}/LanguageSl.php | 0 languages/{ => classes}/LanguageSr.deps.php | 2 +- languages/{ => classes}/LanguageSr.php | 2 +- languages/{ => classes}/LanguageSr_ec.php | 0 .../{ => classes}/LanguageSr_el.deps.php | 0 languages/{ => classes}/LanguageSr_el.php | 0 languages/{ => classes}/LanguageTr.php | 0 languages/{ => classes}/LanguageTyv.php | 0 languages/{ => classes}/LanguageVi.php | 0 languages/{ => classes}/LanguageWa.php | 0 languages/{ => classes}/LanguageZh.deps.php | 2 +- languages/{ => classes}/LanguageZh.php | 2 +- languages/{ => classes}/LanguageZh_cn.php | 0 languages/{ => classes}/LanguageZh_yue.php | 0 languages/{ => messages}/MessagesAb.php | 0 languages/{ => messages}/MessagesAf.php | 0 languages/{ => messages}/MessagesAn.php | 0 languages/{ => messages}/MessagesAr.php | 0 languages/{ => messages}/MessagesArc.php | 0 languages/{ => messages}/MessagesAs.php | 0 languages/{ => messages}/MessagesAst.php | 0 languages/{ => messages}/MessagesAv.php | 0 languages/{ => messages}/MessagesAy.php | 0 languages/{ => messages}/MessagesAz.php | 0 languages/{ => messages}/MessagesBa.php | 0 languages/{ => messages}/MessagesBar.php | 0 languages/{ => messages}/MessagesBat_smg.php | 0 languages/{ => messages}/MessagesBe.php | 0 languages/{ => messages}/MessagesBg.php | 0 languages/{ => messages}/MessagesBm.php | 0 languages/{ => messages}/MessagesBn.php | 0 languages/{ => messages}/MessagesBo.php | 0 languages/{ => messages}/MessagesBpy.php | 0 languages/{ => messages}/MessagesBr.php | 0 languages/{ => messages}/MessagesBs.php | 0 languages/{ => messages}/MessagesCa.php | 0 languages/{ => messages}/MessagesCe.php | 0 languages/{ => messages}/MessagesCs.php | 0 languages/{ => messages}/MessagesCsb.php | 0 languages/{ => messages}/MessagesCv.php | 0 languages/{ => messages}/MessagesCy.php | 0 languages/{ => messages}/MessagesDa.php | 0 languages/{ => messages}/MessagesDe.php | 4 +-- languages/{ => messages}/MessagesDv.php | 0 languages/{ => messages}/MessagesDz.php | 0 languages/{ => messages}/MessagesEl.php | 0 languages/{ => messages}/MessagesEn.php | 0 languages/{ => messages}/MessagesEnRTL.php | 0 languages/{ => messages}/MessagesEo.php | 0 languages/{ => messages}/MessagesEs.php | 0 languages/{ => messages}/MessagesEt.php | 0 languages/{ => messages}/MessagesEu.php | 0 languages/{ => messages}/MessagesFa.php | 0 languages/{ => messages}/MessagesFi.php | 0 languages/{ => messages}/MessagesFo.php | 0 languages/{ => messages}/MessagesFr.php | 0 languages/{ => messages}/MessagesFur.php | 0 languages/{ => messages}/MessagesFy.php | 0 languages/{ => messages}/MessagesGa.php | 0 languages/{ => messages}/MessagesGn.php | 0 languages/{ => messages}/MessagesGsw.php | 0 languages/{ => messages}/MessagesGu.php | 0 languages/{ => messages}/MessagesHe.php | 0 languages/{ => messages}/MessagesHi.php | 0 languages/{ => messages}/MessagesHr.php | 0 languages/{ => messages}/MessagesHu.php | 0 languages/{ => messages}/MessagesIa.php | 0 languages/{ => messages}/MessagesId.php | 0 languages/{ => messages}/MessagesIi.php | 0 languages/{ => messages}/MessagesIs.php | 0 languages/{ => messages}/MessagesIt.php | 0 languages/{ => messages}/MessagesJa.php | 0 languages/{ => messages}/MessagesJbo.php | 0 languages/{ => messages}/MessagesJv.php | 0 languages/{ => messages}/MessagesKa.php | 0 languages/{ => messages}/MessagesKk.php | 0 languages/{ => messages}/MessagesKk_cn.php | 0 languages/{ => messages}/MessagesKm.php | 0 languages/{ => messages}/MessagesKn.php | 0 languages/{ => messages}/MessagesKo.php | 0 languages/{ => messages}/MessagesKs.php | 0 languages/{ => messages}/MessagesKsh.php | 0 languages/{ => messages}/MessagesKu.php | 0 languages/{ => messages}/MessagesKv.php | 0 languages/{ => messages}/MessagesLa.php | 0 languages/{ => messages}/MessagesLi.php | 0 languages/{ => messages}/MessagesLo.php | 0 languages/{ => messages}/MessagesLt.php | 0 languages/{ => messages}/MessagesLv.php | 0 languages/{ => messages}/MessagesMk.php | 0 languages/{ => messages}/MessagesMl.php | 0 languages/{ => messages}/MessagesMs.php | 0 languages/{ => messages}/MessagesMzn.php | 0 languages/{ => messages}/MessagesNah.php | 0 languages/{ => messages}/MessagesNap.php | 0 languages/{ => messages}/MessagesNds.php | 0 languages/{ => messages}/MessagesNds_nl.php | 0 languages/{ => messages}/MessagesNl.php | 0 languages/{ => messages}/MessagesNn.php | 0 languages/{ => messages}/MessagesNo.php | 0 languages/{ => messages}/MessagesNon.php | 0 languages/{ => messages}/MessagesNv.php | 0 languages/{ => messages}/MessagesOc.php | 0 languages/{ => messages}/MessagesOr.php | 0 languages/{ => messages}/MessagesOs.php | 0 languages/{ => messages}/MessagesPa.php | 0 languages/{ => messages}/MessagesPl.php | 0 languages/{ => messages}/MessagesPms.php | 0 languages/{ => messages}/MessagesPs.php | 0 languages/{ => messages}/MessagesPt.php | 0 languages/{ => messages}/MessagesPt_br.php | 0 languages/{ => messages}/MessagesQu.php | 0 languages/{ => messages}/MessagesRmy.php | 0 languages/{ => messages}/MessagesRo.php | 0 languages/{ => messages}/MessagesRu.php | 0 languages/{ => messages}/MessagesSc.php | 0 languages/{ => messages}/MessagesSd.php | 0 languages/{ => messages}/MessagesSk.php | 0 languages/{ => messages}/MessagesSl.php | 0 languages/{ => messages}/MessagesSq.php | 0 languages/{ => messages}/MessagesSr.php | 0 languages/{ => messages}/MessagesSr_ec.php | 0 languages/{ => messages}/MessagesSr_el.php | 0 languages/{ => messages}/MessagesSr_jc.php | 0 languages/{ => messages}/MessagesSr_jl.php | 0 languages/{ => messages}/MessagesSu.php | 0 languages/{ => messages}/MessagesSv.php | 0 languages/{ => messages}/MessagesTa.php | 0 languages/{ => messages}/MessagesTe.php | 0 languages/{ => messages}/MessagesTg.php | 0 languages/{ => messages}/MessagesTh.php | 0 languages/{ => messages}/MessagesTlh.php | 0 languages/{ => messages}/MessagesTr.php | 0 languages/{ => messages}/MessagesTt.php | 0 languages/{ => messages}/MessagesTyv.php | 0 languages/{ => messages}/MessagesUdm.php | 0 languages/{ => messages}/MessagesUg.php | 0 languages/{ => messages}/MessagesUk.php | 0 languages/{ => messages}/MessagesUr.php | 0 languages/{ => messages}/MessagesVec.php | 0 languages/{ => messages}/MessagesVi.php | 0 languages/{ => messages}/MessagesWa.php | 0 languages/{ => messages}/MessagesXal.php | 0 languages/{ => messages}/MessagesYi.php | 0 languages/{ => messages}/MessagesZa.php | 0 languages/{ => messages}/MessagesZh.php | 0 languages/{ => messages}/MessagesZh_cn.php | 0 languages/{ => messages}/MessagesZh_hk.php | 0 languages/{ => messages}/MessagesZh_sg.php | 0 languages/{ => messages}/MessagesZh_tw.php | 0 languages/{ => messages}/MessagesZh_yue.php | 0 languages/scripts/date-formats.php | 2 +- maintenance/checktrans.php | 2 +- maintenance/diffLanguage.php | 2 +- maintenance/duplicatetrans.php | 2 +- maintenance/lang2po.php | 2 +- maintenance/langmemusage.php | 2 +- maintenance/languages.inc | 11 ++------ maintenance/unusedMessages.php | 2 +- 185 files changed, 34 insertions(+), 34 deletions(-) rename languages/{ => classes}/LanguageAz.php (100%) rename languages/{ => classes}/LanguageBe.php (100%) rename languages/{ => classes}/LanguageBg.php (100%) rename languages/{ => classes}/LanguageBs.php (100%) rename languages/{ => classes}/LanguageCs.php (100%) rename languages/{ => classes}/LanguageEo.php (100%) rename languages/{ => classes}/LanguageEt.php (100%) rename languages/{ => classes}/LanguageFi.php (100%) rename languages/{ => classes}/LanguageFr.php (100%) rename languages/{ => classes}/LanguageGa.php (100%) rename languages/{ => classes}/LanguageGsw.php (100%) rename languages/{ => classes}/LanguageHe.php (100%) rename languages/{ => classes}/LanguageHr.php (100%) rename languages/{ => classes}/LanguageHu.php (100%) rename languages/{ => classes}/LanguageJa.php (100%) rename languages/{ => classes}/LanguageKo.php (100%) rename languages/{ => classes}/LanguageKsh.php (100%) rename languages/{ => classes}/LanguageLa.php (100%) rename languages/{ => classes}/LanguageLt.php (100%) rename languages/{ => classes}/LanguageLv.php (100%) rename languages/{ => classes}/LanguagePt_br.php (100%) rename languages/{ => classes}/LanguageRmy.php (100%) rename languages/{ => classes}/LanguageRu.php (100%) rename languages/{ => classes}/LanguageSk.php (100%) rename languages/{ => classes}/LanguageSl.php (100%) rename languages/{ => classes}/LanguageSr.deps.php (86%) rename languages/{ => classes}/LanguageSr.php (98%) rename languages/{ => classes}/LanguageSr_ec.php (100%) rename languages/{ => classes}/LanguageSr_el.deps.php (100%) rename languages/{ => classes}/LanguageSr_el.php (100%) rename languages/{ => classes}/LanguageTr.php (100%) rename languages/{ => classes}/LanguageTyv.php (100%) rename languages/{ => classes}/LanguageVi.php (100%) rename languages/{ => classes}/LanguageWa.php (100%) rename languages/{ => classes}/LanguageZh.deps.php (86%) rename languages/{ => classes}/LanguageZh.php (97%) rename languages/{ => classes}/LanguageZh_cn.php (100%) rename languages/{ => classes}/LanguageZh_yue.php (100%) rename languages/{ => messages}/MessagesAb.php (100%) rename languages/{ => messages}/MessagesAf.php (100%) rename languages/{ => messages}/MessagesAn.php (100%) rename languages/{ => messages}/MessagesAr.php (100%) rename languages/{ => messages}/MessagesArc.php (100%) rename languages/{ => messages}/MessagesAs.php (100%) rename languages/{ => messages}/MessagesAst.php (100%) rename languages/{ => messages}/MessagesAv.php (100%) rename languages/{ => messages}/MessagesAy.php (100%) rename languages/{ => messages}/MessagesAz.php (100%) rename languages/{ => messages}/MessagesBa.php (100%) rename languages/{ => messages}/MessagesBar.php (100%) rename languages/{ => messages}/MessagesBat_smg.php (100%) rename languages/{ => messages}/MessagesBe.php (100%) rename languages/{ => messages}/MessagesBg.php (100%) rename languages/{ => messages}/MessagesBm.php (100%) rename languages/{ => messages}/MessagesBn.php (100%) rename languages/{ => messages}/MessagesBo.php (100%) rename languages/{ => messages}/MessagesBpy.php (100%) rename languages/{ => messages}/MessagesBr.php (100%) rename languages/{ => messages}/MessagesBs.php (100%) rename languages/{ => messages}/MessagesCa.php (100%) rename languages/{ => messages}/MessagesCe.php (100%) rename languages/{ => messages}/MessagesCs.php (100%) rename languages/{ => messages}/MessagesCsb.php (100%) rename languages/{ => messages}/MessagesCv.php (100%) rename languages/{ => messages}/MessagesCy.php (100%) rename languages/{ => messages}/MessagesDa.php (100%) rename languages/{ => messages}/MessagesDe.php (99%) rename languages/{ => messages}/MessagesDv.php (100%) rename languages/{ => messages}/MessagesDz.php (100%) rename languages/{ => messages}/MessagesEl.php (100%) rename languages/{ => messages}/MessagesEn.php (100%) rename languages/{ => messages}/MessagesEnRTL.php (100%) rename languages/{ => messages}/MessagesEo.php (100%) rename languages/{ => messages}/MessagesEs.php (100%) rename languages/{ => messages}/MessagesEt.php (100%) rename languages/{ => messages}/MessagesEu.php (100%) rename languages/{ => messages}/MessagesFa.php (100%) rename languages/{ => messages}/MessagesFi.php (100%) rename languages/{ => messages}/MessagesFo.php (100%) rename languages/{ => messages}/MessagesFr.php (100%) rename languages/{ => messages}/MessagesFur.php (100%) rename languages/{ => messages}/MessagesFy.php (100%) rename languages/{ => messages}/MessagesGa.php (100%) rename languages/{ => messages}/MessagesGn.php (100%) rename languages/{ => messages}/MessagesGsw.php (100%) rename languages/{ => messages}/MessagesGu.php (100%) rename languages/{ => messages}/MessagesHe.php (100%) rename languages/{ => messages}/MessagesHi.php (100%) rename languages/{ => messages}/MessagesHr.php (100%) rename languages/{ => messages}/MessagesHu.php (100%) rename languages/{ => messages}/MessagesIa.php (100%) rename languages/{ => messages}/MessagesId.php (100%) rename languages/{ => messages}/MessagesIi.php (100%) rename languages/{ => messages}/MessagesIs.php (100%) rename languages/{ => messages}/MessagesIt.php (100%) rename languages/{ => messages}/MessagesJa.php (100%) rename languages/{ => messages}/MessagesJbo.php (100%) rename languages/{ => messages}/MessagesJv.php (100%) rename languages/{ => messages}/MessagesKa.php (100%) rename languages/{ => messages}/MessagesKk.php (100%) rename languages/{ => messages}/MessagesKk_cn.php (100%) rename languages/{ => messages}/MessagesKm.php (100%) rename languages/{ => messages}/MessagesKn.php (100%) rename languages/{ => messages}/MessagesKo.php (100%) rename languages/{ => messages}/MessagesKs.php (100%) rename languages/{ => messages}/MessagesKsh.php (100%) rename languages/{ => messages}/MessagesKu.php (100%) rename languages/{ => messages}/MessagesKv.php (100%) rename languages/{ => messages}/MessagesLa.php (100%) rename languages/{ => messages}/MessagesLi.php (100%) rename languages/{ => messages}/MessagesLo.php (100%) rename languages/{ => messages}/MessagesLt.php (100%) rename languages/{ => messages}/MessagesLv.php (100%) rename languages/{ => messages}/MessagesMk.php (100%) rename languages/{ => messages}/MessagesMl.php (100%) rename languages/{ => messages}/MessagesMs.php (100%) rename languages/{ => messages}/MessagesMzn.php (100%) rename languages/{ => messages}/MessagesNah.php (100%) rename languages/{ => messages}/MessagesNap.php (100%) rename languages/{ => messages}/MessagesNds.php (100%) rename languages/{ => messages}/MessagesNds_nl.php (100%) rename languages/{ => messages}/MessagesNl.php (100%) rename languages/{ => messages}/MessagesNn.php (100%) rename languages/{ => messages}/MessagesNo.php (100%) rename languages/{ => messages}/MessagesNon.php (100%) rename languages/{ => messages}/MessagesNv.php (100%) rename languages/{ => messages}/MessagesOc.php (100%) rename languages/{ => messages}/MessagesOr.php (100%) rename languages/{ => messages}/MessagesOs.php (100%) rename languages/{ => messages}/MessagesPa.php (100%) rename languages/{ => messages}/MessagesPl.php (100%) rename languages/{ => messages}/MessagesPms.php (100%) rename languages/{ => messages}/MessagesPs.php (100%) rename languages/{ => messages}/MessagesPt.php (100%) rename languages/{ => messages}/MessagesPt_br.php (100%) rename languages/{ => messages}/MessagesQu.php (100%) rename languages/{ => messages}/MessagesRmy.php (100%) rename languages/{ => messages}/MessagesRo.php (100%) rename languages/{ => messages}/MessagesRu.php (100%) rename languages/{ => messages}/MessagesSc.php (100%) rename languages/{ => messages}/MessagesSd.php (100%) rename languages/{ => messages}/MessagesSk.php (100%) rename languages/{ => messages}/MessagesSl.php (100%) rename languages/{ => messages}/MessagesSq.php (100%) rename languages/{ => messages}/MessagesSr.php (100%) rename languages/{ => messages}/MessagesSr_ec.php (100%) rename languages/{ => messages}/MessagesSr_el.php (100%) rename languages/{ => messages}/MessagesSr_jc.php (100%) rename languages/{ => messages}/MessagesSr_jl.php (100%) rename languages/{ => messages}/MessagesSu.php (100%) rename languages/{ => messages}/MessagesSv.php (100%) rename languages/{ => messages}/MessagesTa.php (100%) rename languages/{ => messages}/MessagesTe.php (100%) rename languages/{ => messages}/MessagesTg.php (100%) rename languages/{ => messages}/MessagesTh.php (100%) rename languages/{ => messages}/MessagesTlh.php (100%) rename languages/{ => messages}/MessagesTr.php (100%) rename languages/{ => messages}/MessagesTt.php (100%) rename languages/{ => messages}/MessagesTyv.php (100%) rename languages/{ => messages}/MessagesUdm.php (100%) rename languages/{ => messages}/MessagesUg.php (100%) rename languages/{ => messages}/MessagesUk.php (100%) rename languages/{ => messages}/MessagesUr.php (100%) rename languages/{ => messages}/MessagesVec.php (100%) rename languages/{ => messages}/MessagesVi.php (100%) rename languages/{ => messages}/MessagesWa.php (100%) rename languages/{ => messages}/MessagesXal.php (100%) rename languages/{ => messages}/MessagesYi.php (100%) rename languages/{ => messages}/MessagesZa.php (100%) rename languages/{ => messages}/MessagesZh.php (100%) rename languages/{ => messages}/MessagesZh_cn.php (100%) rename languages/{ => messages}/MessagesZh_hk.php (100%) rename languages/{ => messages}/MessagesZh_sg.php (100%) rename languages/{ => messages}/MessagesZh_tw.php (100%) rename languages/{ => messages}/MessagesZh_yue.php (100%) diff --git a/config/index.php b/config/index.php index b13e9c3fd8..815d217d65 100644 --- a/config/index.php +++ b/config/index.php @@ -1528,10 +1528,10 @@ function getLanguageList() { $codes = array(); - $d = opendir( "../languages" ); + $d = opendir( "../languages/messages" ); /* In case we are called from the root directory */ if (!$d) - $d = opendir( "languages"); + $d = opendir( "languages/messages"); while( false !== ($f = readdir( $d ) ) ) { $m = array(); if( preg_match( '/Messages([A-Z][a-z_]+)\.php$/', $f, $m ) ) { diff --git a/languages/Language.php b/languages/Language.php index a3990d67d0..c7f7076425 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -105,7 +105,6 @@ class Language { * Create a language object for a given language code */ static function factory( $code ) { - global $IP; static $recursionLevel = 0; if ( $code == 'en' ) { @@ -113,11 +112,11 @@ class Language { } else { $class = 'Language' . str_replace( '-', '_', ucfirst( $code ) ); // Preload base classes to work around APC/PHP5 bug - if ( file_exists( "$IP/languages/$class.deps.php" ) ) { - include_once("$IP/languages/$class.deps.php"); + if ( file_exists( "$IP/languages/classes/$class.deps.php" ) ) { + include_once("$IP/languages/classes/$class.deps.php"); } - if ( file_exists( "$IP/languages/$class.php" ) ) { - include_once("$IP/languages/$class.php"); + if ( file_exists( "$IP/languages/classes/$class.php" ) ) { + include_once("$IP/languages/classes/$class.php"); } } @@ -312,7 +311,7 @@ class Language { } global $IP; - $messageFiles = glob( "$IP/languages/Messages*.php" ); + $messageFiles = glob( "$IP/languages/messages/Messages*.php" ); $names = array(); foreach ( $messageFiles as $file ) { if( preg_match( '/Messages([A-Z][a-z_]+)\.php$/', $file, $m ) ) { @@ -1440,6 +1439,16 @@ class Language { return $prefix . str_replace( '-', '_', ucfirst( $code ) ) . $suffix; } + static function getMessagesFileName( $code ) { + global $IP; + return self::getFileName( "$IP/languages/messages/Messages", $code, '.php' ); + } + + static function getClassFileName( $code ) { + global $IP; + return self::getFileName( "$IP/languages/classes/Language", $code, '.php' ); + } + static function getLocalisationArray( $code, $disableCache = false ) { self::loadLocalisation( $code, $disableCache ); return self::$mLocalisationCache[$code]; @@ -1452,7 +1461,7 @@ class Language { */ static function loadLocalisation( $code, $disableCache = false ) { static $recursionGuard = array(); - global $wgMemc, $wgDBname, $IP; + global $wgMemc, $wgDBname; if ( !$code ) { throw new MWException( "Invalid language code requested" ); @@ -1509,8 +1518,7 @@ class Language { } # Load the primary localisation from the source file - global $IP; - $filename = self::getFileName( "$IP/languages/Messages", $code, '.php' ); + $filename = self::getMessagesFileName( $code ); if ( !file_exists( $filename ) ) { wfDebug( "No localisation file for $code, using implicit fallback to en\n" ); $cache = array(); @@ -1700,7 +1708,6 @@ class Language { static function getCaseMaps() { static $wikiUpperChars, $wikiLowerChars; - global $IP; if ( isset( $wikiUpperChars ) ) { return array( $wikiUpperChars, $wikiLowerChars ); } diff --git a/languages/LanguageAz.php b/languages/classes/LanguageAz.php similarity index 100% rename from languages/LanguageAz.php rename to languages/classes/LanguageAz.php diff --git a/languages/LanguageBe.php b/languages/classes/LanguageBe.php similarity index 100% rename from languages/LanguageBe.php rename to languages/classes/LanguageBe.php diff --git a/languages/LanguageBg.php b/languages/classes/LanguageBg.php similarity index 100% rename from languages/LanguageBg.php rename to languages/classes/LanguageBg.php diff --git a/languages/LanguageBs.php b/languages/classes/LanguageBs.php similarity index 100% rename from languages/LanguageBs.php rename to languages/classes/LanguageBs.php diff --git a/languages/LanguageCs.php b/languages/classes/LanguageCs.php similarity index 100% rename from languages/LanguageCs.php rename to languages/classes/LanguageCs.php diff --git a/languages/LanguageEo.php b/languages/classes/LanguageEo.php similarity index 100% rename from languages/LanguageEo.php rename to languages/classes/LanguageEo.php diff --git a/languages/LanguageEt.php b/languages/classes/LanguageEt.php similarity index 100% rename from languages/LanguageEt.php rename to languages/classes/LanguageEt.php diff --git a/languages/LanguageFi.php b/languages/classes/LanguageFi.php similarity index 100% rename from languages/LanguageFi.php rename to languages/classes/LanguageFi.php diff --git a/languages/LanguageFr.php b/languages/classes/LanguageFr.php similarity index 100% rename from languages/LanguageFr.php rename to languages/classes/LanguageFr.php diff --git a/languages/LanguageGa.php b/languages/classes/LanguageGa.php similarity index 100% rename from languages/LanguageGa.php rename to languages/classes/LanguageGa.php diff --git a/languages/LanguageGsw.php b/languages/classes/LanguageGsw.php similarity index 100% rename from languages/LanguageGsw.php rename to languages/classes/LanguageGsw.php diff --git a/languages/LanguageHe.php b/languages/classes/LanguageHe.php similarity index 100% rename from languages/LanguageHe.php rename to languages/classes/LanguageHe.php diff --git a/languages/LanguageHr.php b/languages/classes/LanguageHr.php similarity index 100% rename from languages/LanguageHr.php rename to languages/classes/LanguageHr.php diff --git a/languages/LanguageHu.php b/languages/classes/LanguageHu.php similarity index 100% rename from languages/LanguageHu.php rename to languages/classes/LanguageHu.php diff --git a/languages/LanguageJa.php b/languages/classes/LanguageJa.php similarity index 100% rename from languages/LanguageJa.php rename to languages/classes/LanguageJa.php diff --git a/languages/LanguageKo.php b/languages/classes/LanguageKo.php similarity index 100% rename from languages/LanguageKo.php rename to languages/classes/LanguageKo.php diff --git a/languages/LanguageKsh.php b/languages/classes/LanguageKsh.php similarity index 100% rename from languages/LanguageKsh.php rename to languages/classes/LanguageKsh.php diff --git a/languages/LanguageLa.php b/languages/classes/LanguageLa.php similarity index 100% rename from languages/LanguageLa.php rename to languages/classes/LanguageLa.php diff --git a/languages/LanguageLt.php b/languages/classes/LanguageLt.php similarity index 100% rename from languages/LanguageLt.php rename to languages/classes/LanguageLt.php diff --git a/languages/LanguageLv.php b/languages/classes/LanguageLv.php similarity index 100% rename from languages/LanguageLv.php rename to languages/classes/LanguageLv.php diff --git a/languages/LanguagePt_br.php b/languages/classes/LanguagePt_br.php similarity index 100% rename from languages/LanguagePt_br.php rename to languages/classes/LanguagePt_br.php diff --git a/languages/LanguageRmy.php b/languages/classes/LanguageRmy.php similarity index 100% rename from languages/LanguageRmy.php rename to languages/classes/LanguageRmy.php diff --git a/languages/LanguageRu.php b/languages/classes/LanguageRu.php similarity index 100% rename from languages/LanguageRu.php rename to languages/classes/LanguageRu.php diff --git a/languages/LanguageSk.php b/languages/classes/LanguageSk.php similarity index 100% rename from languages/LanguageSk.php rename to languages/classes/LanguageSk.php diff --git a/languages/LanguageSl.php b/languages/classes/LanguageSl.php similarity index 100% rename from languages/LanguageSl.php rename to languages/classes/LanguageSl.php diff --git a/languages/LanguageSr.deps.php b/languages/classes/LanguageSr.deps.php similarity index 86% rename from languages/LanguageSr.deps.php rename to languages/classes/LanguageSr.deps.php index acfd954449..8fe354e0a1 100644 --- a/languages/LanguageSr.deps.php +++ b/languages/classes/LanguageSr.deps.php @@ -6,5 +6,5 @@ // see http://mail.wikipedia.org/pipermail/wikitech-l/2006-January/033660.html require_once( dirname(__FILE__).'/LanguageSr_ec.php' ); -require_once( dirname(__FILE__).'/LanguageConverter.php' ); +require_once( dirname(__FILE__).'/../LanguageConverter.php' ); ?> diff --git a/languages/LanguageSr.php b/languages/classes/LanguageSr.php similarity index 98% rename from languages/LanguageSr.php rename to languages/classes/LanguageSr.php index d0f3866c56..412463f88b 100644 --- a/languages/LanguageSr.php +++ b/languages/classes/LanguageSr.php @@ -11,7 +11,7 @@ dictionaries: one for Cyrillics and Latin, and one for ekavian and iyekavian. */ -require_once( dirname(__FILE__).'/LanguageConverter.php' ); +require_once( dirname(__FILE__).'/../LanguageConverter.php' ); require_once( dirname(__FILE__).'/LanguageSr_ec.php' ); require_once( dirname(__FILE__).'/LanguageSr_el.php' ); diff --git a/languages/LanguageSr_ec.php b/languages/classes/LanguageSr_ec.php similarity index 100% rename from languages/LanguageSr_ec.php rename to languages/classes/LanguageSr_ec.php diff --git a/languages/LanguageSr_el.deps.php b/languages/classes/LanguageSr_el.deps.php similarity index 100% rename from languages/LanguageSr_el.deps.php rename to languages/classes/LanguageSr_el.deps.php diff --git a/languages/LanguageSr_el.php b/languages/classes/LanguageSr_el.php similarity index 100% rename from languages/LanguageSr_el.php rename to languages/classes/LanguageSr_el.php diff --git a/languages/LanguageTr.php b/languages/classes/LanguageTr.php similarity index 100% rename from languages/LanguageTr.php rename to languages/classes/LanguageTr.php diff --git a/languages/LanguageTyv.php b/languages/classes/LanguageTyv.php similarity index 100% rename from languages/LanguageTyv.php rename to languages/classes/LanguageTyv.php diff --git a/languages/LanguageVi.php b/languages/classes/LanguageVi.php similarity index 100% rename from languages/LanguageVi.php rename to languages/classes/LanguageVi.php diff --git a/languages/LanguageWa.php b/languages/classes/LanguageWa.php similarity index 100% rename from languages/LanguageWa.php rename to languages/classes/LanguageWa.php diff --git a/languages/LanguageZh.deps.php b/languages/classes/LanguageZh.deps.php similarity index 86% rename from languages/LanguageZh.deps.php rename to languages/classes/LanguageZh.deps.php index cf18594631..1d736340f1 100644 --- a/languages/LanguageZh.deps.php +++ b/languages/classes/LanguageZh.deps.php @@ -6,5 +6,5 @@ // see http://mail.wikipedia.org/pipermail/wikitech-l/2006-January/033660.html require_once( dirname(__FILE__).'/LanguageZh_cn.php' ); -require_once( dirname(__FILE__).'/LanguageConverter.php' ); +require_once( dirname(__FILE__).'/../LanguageConverter.php' ); ?> diff --git a/languages/LanguageZh.php b/languages/classes/LanguageZh.php similarity index 97% rename from languages/LanguageZh.php rename to languages/classes/LanguageZh.php index d3a62da101..c34315ac11 100644 --- a/languages/LanguageZh.php +++ b/languages/classes/LanguageZh.php @@ -3,7 +3,7 @@ * @package MediaWiki * @subpackage Language */ -require_once( dirname(__FILE__).'/LanguageConverter.php' ); +require_once( dirname(__FILE__).'/../LanguageConverter.php' ); require_once( dirname(__FILE__).'/LanguageZh_cn.php' ); class ZhConverter extends LanguageConverter { diff --git a/languages/LanguageZh_cn.php b/languages/classes/LanguageZh_cn.php similarity index 100% rename from languages/LanguageZh_cn.php rename to languages/classes/LanguageZh_cn.php diff --git a/languages/LanguageZh_yue.php b/languages/classes/LanguageZh_yue.php similarity index 100% rename from languages/LanguageZh_yue.php rename to languages/classes/LanguageZh_yue.php diff --git a/languages/MessagesAb.php b/languages/messages/MessagesAb.php similarity index 100% rename from languages/MessagesAb.php rename to languages/messages/MessagesAb.php diff --git a/languages/MessagesAf.php b/languages/messages/MessagesAf.php similarity index 100% rename from languages/MessagesAf.php rename to languages/messages/MessagesAf.php diff --git a/languages/MessagesAn.php b/languages/messages/MessagesAn.php similarity index 100% rename from languages/MessagesAn.php rename to languages/messages/MessagesAn.php diff --git a/languages/MessagesAr.php b/languages/messages/MessagesAr.php similarity index 100% rename from languages/MessagesAr.php rename to languages/messages/MessagesAr.php diff --git a/languages/MessagesArc.php b/languages/messages/MessagesArc.php similarity index 100% rename from languages/MessagesArc.php rename to languages/messages/MessagesArc.php diff --git a/languages/MessagesAs.php b/languages/messages/MessagesAs.php similarity index 100% rename from languages/MessagesAs.php rename to languages/messages/MessagesAs.php diff --git a/languages/MessagesAst.php b/languages/messages/MessagesAst.php similarity index 100% rename from languages/MessagesAst.php rename to languages/messages/MessagesAst.php diff --git a/languages/MessagesAv.php b/languages/messages/MessagesAv.php similarity index 100% rename from languages/MessagesAv.php rename to languages/messages/MessagesAv.php diff --git a/languages/MessagesAy.php b/languages/messages/MessagesAy.php similarity index 100% rename from languages/MessagesAy.php rename to languages/messages/MessagesAy.php diff --git a/languages/MessagesAz.php b/languages/messages/MessagesAz.php similarity index 100% rename from languages/MessagesAz.php rename to languages/messages/MessagesAz.php diff --git a/languages/MessagesBa.php b/languages/messages/MessagesBa.php similarity index 100% rename from languages/MessagesBa.php rename to languages/messages/MessagesBa.php diff --git a/languages/MessagesBar.php b/languages/messages/MessagesBar.php similarity index 100% rename from languages/MessagesBar.php rename to languages/messages/MessagesBar.php diff --git a/languages/MessagesBat_smg.php b/languages/messages/MessagesBat_smg.php similarity index 100% rename from languages/MessagesBat_smg.php rename to languages/messages/MessagesBat_smg.php diff --git a/languages/MessagesBe.php b/languages/messages/MessagesBe.php similarity index 100% rename from languages/MessagesBe.php rename to languages/messages/MessagesBe.php diff --git a/languages/MessagesBg.php b/languages/messages/MessagesBg.php similarity index 100% rename from languages/MessagesBg.php rename to languages/messages/MessagesBg.php diff --git a/languages/MessagesBm.php b/languages/messages/MessagesBm.php similarity index 100% rename from languages/MessagesBm.php rename to languages/messages/MessagesBm.php diff --git a/languages/MessagesBn.php b/languages/messages/MessagesBn.php similarity index 100% rename from languages/MessagesBn.php rename to languages/messages/MessagesBn.php diff --git a/languages/MessagesBo.php b/languages/messages/MessagesBo.php similarity index 100% rename from languages/MessagesBo.php rename to languages/messages/MessagesBo.php diff --git a/languages/MessagesBpy.php b/languages/messages/MessagesBpy.php similarity index 100% rename from languages/MessagesBpy.php rename to languages/messages/MessagesBpy.php diff --git a/languages/MessagesBr.php b/languages/messages/MessagesBr.php similarity index 100% rename from languages/MessagesBr.php rename to languages/messages/MessagesBr.php diff --git a/languages/MessagesBs.php b/languages/messages/MessagesBs.php similarity index 100% rename from languages/MessagesBs.php rename to languages/messages/MessagesBs.php diff --git a/languages/MessagesCa.php b/languages/messages/MessagesCa.php similarity index 100% rename from languages/MessagesCa.php rename to languages/messages/MessagesCa.php diff --git a/languages/MessagesCe.php b/languages/messages/MessagesCe.php similarity index 100% rename from languages/MessagesCe.php rename to languages/messages/MessagesCe.php diff --git a/languages/MessagesCs.php b/languages/messages/MessagesCs.php similarity index 100% rename from languages/MessagesCs.php rename to languages/messages/MessagesCs.php diff --git a/languages/MessagesCsb.php b/languages/messages/MessagesCsb.php similarity index 100% rename from languages/MessagesCsb.php rename to languages/messages/MessagesCsb.php diff --git a/languages/MessagesCv.php b/languages/messages/MessagesCv.php similarity index 100% rename from languages/MessagesCv.php rename to languages/messages/MessagesCv.php diff --git a/languages/MessagesCy.php b/languages/messages/MessagesCy.php similarity index 100% rename from languages/MessagesCy.php rename to languages/messages/MessagesCy.php diff --git a/languages/MessagesDa.php b/languages/messages/MessagesDa.php similarity index 100% rename from languages/MessagesDa.php rename to languages/messages/MessagesDa.php diff --git a/languages/MessagesDe.php b/languages/messages/MessagesDe.php similarity index 99% rename from languages/MessagesDe.php rename to languages/messages/MessagesDe.php index 434fbfdee9..b973d3bfb6 100644 --- a/languages/MessagesDe.php +++ b/languages/messages/MessagesDe.php @@ -264,7 +264,7 @@ $messages = array( "redirectedfrom" => "(Weitergeleitet von $1)", 'autoredircomment' => 'Weiterleitung nach [[$1]]', 'redirectpagesub' => 'Weiterleitung', -'lastmodifiedat' => 'Diese Seite wurde zuletzt am $1 um $2 Uhr geändert.', +'lastmodifiedat' => 'Diese Seite wurde zuletzt geändert am $1 um $2 Uhr.', "viewcount" => "Diese Seite wurde bisher $1 mal abgerufen.", "copyright" => "Inhalt ist verfügbar unter der $1.", "protectedpage" => "Geschützte Seite", @@ -1350,7 +1350,7 @@ Alternativ ist der Export auch mit der Syntax [[Spezial:Export/Seite # Attribution 'anonymous' => 'Anonyme(r) Benutzer auf {{SITENAME}}', -'lastmodifiedatby' => 'Diese Seite wurde zuletzt am $1 um $2 Uhr von $3 geändert.', +'lastmodifiedatby' => 'Diese Seite wurde zuletzt geändert am $1 um $2 Uhr von $3.', 'othercontribs' => 'Basiert auf der Arbeit von $1', 'others' => 'andere', 'creditspage' => 'Seiteninformationen', diff --git a/languages/MessagesDv.php b/languages/messages/MessagesDv.php similarity index 100% rename from languages/MessagesDv.php rename to languages/messages/MessagesDv.php diff --git a/languages/MessagesDz.php b/languages/messages/MessagesDz.php similarity index 100% rename from languages/MessagesDz.php rename to languages/messages/MessagesDz.php diff --git a/languages/MessagesEl.php b/languages/messages/MessagesEl.php similarity index 100% rename from languages/MessagesEl.php rename to languages/messages/MessagesEl.php diff --git a/languages/MessagesEn.php b/languages/messages/MessagesEn.php similarity index 100% rename from languages/MessagesEn.php rename to languages/messages/MessagesEn.php diff --git a/languages/MessagesEnRTL.php b/languages/messages/MessagesEnRTL.php similarity index 100% rename from languages/MessagesEnRTL.php rename to languages/messages/MessagesEnRTL.php diff --git a/languages/MessagesEo.php b/languages/messages/MessagesEo.php similarity index 100% rename from languages/MessagesEo.php rename to languages/messages/MessagesEo.php diff --git a/languages/MessagesEs.php b/languages/messages/MessagesEs.php similarity index 100% rename from languages/MessagesEs.php rename to languages/messages/MessagesEs.php diff --git a/languages/MessagesEt.php b/languages/messages/MessagesEt.php similarity index 100% rename from languages/MessagesEt.php rename to languages/messages/MessagesEt.php diff --git a/languages/MessagesEu.php b/languages/messages/MessagesEu.php similarity index 100% rename from languages/MessagesEu.php rename to languages/messages/MessagesEu.php diff --git a/languages/MessagesFa.php b/languages/messages/MessagesFa.php similarity index 100% rename from languages/MessagesFa.php rename to languages/messages/MessagesFa.php diff --git a/languages/MessagesFi.php b/languages/messages/MessagesFi.php similarity index 100% rename from languages/MessagesFi.php rename to languages/messages/MessagesFi.php diff --git a/languages/MessagesFo.php b/languages/messages/MessagesFo.php similarity index 100% rename from languages/MessagesFo.php rename to languages/messages/MessagesFo.php diff --git a/languages/MessagesFr.php b/languages/messages/MessagesFr.php similarity index 100% rename from languages/MessagesFr.php rename to languages/messages/MessagesFr.php diff --git a/languages/MessagesFur.php b/languages/messages/MessagesFur.php similarity index 100% rename from languages/MessagesFur.php rename to languages/messages/MessagesFur.php diff --git a/languages/MessagesFy.php b/languages/messages/MessagesFy.php similarity index 100% rename from languages/MessagesFy.php rename to languages/messages/MessagesFy.php diff --git a/languages/MessagesGa.php b/languages/messages/MessagesGa.php similarity index 100% rename from languages/MessagesGa.php rename to languages/messages/MessagesGa.php diff --git a/languages/MessagesGn.php b/languages/messages/MessagesGn.php similarity index 100% rename from languages/MessagesGn.php rename to languages/messages/MessagesGn.php diff --git a/languages/MessagesGsw.php b/languages/messages/MessagesGsw.php similarity index 100% rename from languages/MessagesGsw.php rename to languages/messages/MessagesGsw.php diff --git a/languages/MessagesGu.php b/languages/messages/MessagesGu.php similarity index 100% rename from languages/MessagesGu.php rename to languages/messages/MessagesGu.php diff --git a/languages/MessagesHe.php b/languages/messages/MessagesHe.php similarity index 100% rename from languages/MessagesHe.php rename to languages/messages/MessagesHe.php diff --git a/languages/MessagesHi.php b/languages/messages/MessagesHi.php similarity index 100% rename from languages/MessagesHi.php rename to languages/messages/MessagesHi.php diff --git a/languages/MessagesHr.php b/languages/messages/MessagesHr.php similarity index 100% rename from languages/MessagesHr.php rename to languages/messages/MessagesHr.php diff --git a/languages/MessagesHu.php b/languages/messages/MessagesHu.php similarity index 100% rename from languages/MessagesHu.php rename to languages/messages/MessagesHu.php diff --git a/languages/MessagesIa.php b/languages/messages/MessagesIa.php similarity index 100% rename from languages/MessagesIa.php rename to languages/messages/MessagesIa.php diff --git a/languages/MessagesId.php b/languages/messages/MessagesId.php similarity index 100% rename from languages/MessagesId.php rename to languages/messages/MessagesId.php diff --git a/languages/MessagesIi.php b/languages/messages/MessagesIi.php similarity index 100% rename from languages/MessagesIi.php rename to languages/messages/MessagesIi.php diff --git a/languages/MessagesIs.php b/languages/messages/MessagesIs.php similarity index 100% rename from languages/MessagesIs.php rename to languages/messages/MessagesIs.php diff --git a/languages/MessagesIt.php b/languages/messages/MessagesIt.php similarity index 100% rename from languages/MessagesIt.php rename to languages/messages/MessagesIt.php diff --git a/languages/MessagesJa.php b/languages/messages/MessagesJa.php similarity index 100% rename from languages/MessagesJa.php rename to languages/messages/MessagesJa.php diff --git a/languages/MessagesJbo.php b/languages/messages/MessagesJbo.php similarity index 100% rename from languages/MessagesJbo.php rename to languages/messages/MessagesJbo.php diff --git a/languages/MessagesJv.php b/languages/messages/MessagesJv.php similarity index 100% rename from languages/MessagesJv.php rename to languages/messages/MessagesJv.php diff --git a/languages/MessagesKa.php b/languages/messages/MessagesKa.php similarity index 100% rename from languages/MessagesKa.php rename to languages/messages/MessagesKa.php diff --git a/languages/MessagesKk.php b/languages/messages/MessagesKk.php similarity index 100% rename from languages/MessagesKk.php rename to languages/messages/MessagesKk.php diff --git a/languages/MessagesKk_cn.php b/languages/messages/MessagesKk_cn.php similarity index 100% rename from languages/MessagesKk_cn.php rename to languages/messages/MessagesKk_cn.php diff --git a/languages/MessagesKm.php b/languages/messages/MessagesKm.php similarity index 100% rename from languages/MessagesKm.php rename to languages/messages/MessagesKm.php diff --git a/languages/MessagesKn.php b/languages/messages/MessagesKn.php similarity index 100% rename from languages/MessagesKn.php rename to languages/messages/MessagesKn.php diff --git a/languages/MessagesKo.php b/languages/messages/MessagesKo.php similarity index 100% rename from languages/MessagesKo.php rename to languages/messages/MessagesKo.php diff --git a/languages/MessagesKs.php b/languages/messages/MessagesKs.php similarity index 100% rename from languages/MessagesKs.php rename to languages/messages/MessagesKs.php diff --git a/languages/MessagesKsh.php b/languages/messages/MessagesKsh.php similarity index 100% rename from languages/MessagesKsh.php rename to languages/messages/MessagesKsh.php diff --git a/languages/MessagesKu.php b/languages/messages/MessagesKu.php similarity index 100% rename from languages/MessagesKu.php rename to languages/messages/MessagesKu.php diff --git a/languages/MessagesKv.php b/languages/messages/MessagesKv.php similarity index 100% rename from languages/MessagesKv.php rename to languages/messages/MessagesKv.php diff --git a/languages/MessagesLa.php b/languages/messages/MessagesLa.php similarity index 100% rename from languages/MessagesLa.php rename to languages/messages/MessagesLa.php diff --git a/languages/MessagesLi.php b/languages/messages/MessagesLi.php similarity index 100% rename from languages/MessagesLi.php rename to languages/messages/MessagesLi.php diff --git a/languages/MessagesLo.php b/languages/messages/MessagesLo.php similarity index 100% rename from languages/MessagesLo.php rename to languages/messages/MessagesLo.php diff --git a/languages/MessagesLt.php b/languages/messages/MessagesLt.php similarity index 100% rename from languages/MessagesLt.php rename to languages/messages/MessagesLt.php diff --git a/languages/MessagesLv.php b/languages/messages/MessagesLv.php similarity index 100% rename from languages/MessagesLv.php rename to languages/messages/MessagesLv.php diff --git a/languages/MessagesMk.php b/languages/messages/MessagesMk.php similarity index 100% rename from languages/MessagesMk.php rename to languages/messages/MessagesMk.php diff --git a/languages/MessagesMl.php b/languages/messages/MessagesMl.php similarity index 100% rename from languages/MessagesMl.php rename to languages/messages/MessagesMl.php diff --git a/languages/MessagesMs.php b/languages/messages/MessagesMs.php similarity index 100% rename from languages/MessagesMs.php rename to languages/messages/MessagesMs.php diff --git a/languages/MessagesMzn.php b/languages/messages/MessagesMzn.php similarity index 100% rename from languages/MessagesMzn.php rename to languages/messages/MessagesMzn.php diff --git a/languages/MessagesNah.php b/languages/messages/MessagesNah.php similarity index 100% rename from languages/MessagesNah.php rename to languages/messages/MessagesNah.php diff --git a/languages/MessagesNap.php b/languages/messages/MessagesNap.php similarity index 100% rename from languages/MessagesNap.php rename to languages/messages/MessagesNap.php diff --git a/languages/MessagesNds.php b/languages/messages/MessagesNds.php similarity index 100% rename from languages/MessagesNds.php rename to languages/messages/MessagesNds.php diff --git a/languages/MessagesNds_nl.php b/languages/messages/MessagesNds_nl.php similarity index 100% rename from languages/MessagesNds_nl.php rename to languages/messages/MessagesNds_nl.php diff --git a/languages/MessagesNl.php b/languages/messages/MessagesNl.php similarity index 100% rename from languages/MessagesNl.php rename to languages/messages/MessagesNl.php diff --git a/languages/MessagesNn.php b/languages/messages/MessagesNn.php similarity index 100% rename from languages/MessagesNn.php rename to languages/messages/MessagesNn.php diff --git a/languages/MessagesNo.php b/languages/messages/MessagesNo.php similarity index 100% rename from languages/MessagesNo.php rename to languages/messages/MessagesNo.php diff --git a/languages/MessagesNon.php b/languages/messages/MessagesNon.php similarity index 100% rename from languages/MessagesNon.php rename to languages/messages/MessagesNon.php diff --git a/languages/MessagesNv.php b/languages/messages/MessagesNv.php similarity index 100% rename from languages/MessagesNv.php rename to languages/messages/MessagesNv.php diff --git a/languages/MessagesOc.php b/languages/messages/MessagesOc.php similarity index 100% rename from languages/MessagesOc.php rename to languages/messages/MessagesOc.php diff --git a/languages/MessagesOr.php b/languages/messages/MessagesOr.php similarity index 100% rename from languages/MessagesOr.php rename to languages/messages/MessagesOr.php diff --git a/languages/MessagesOs.php b/languages/messages/MessagesOs.php similarity index 100% rename from languages/MessagesOs.php rename to languages/messages/MessagesOs.php diff --git a/languages/MessagesPa.php b/languages/messages/MessagesPa.php similarity index 100% rename from languages/MessagesPa.php rename to languages/messages/MessagesPa.php diff --git a/languages/MessagesPl.php b/languages/messages/MessagesPl.php similarity index 100% rename from languages/MessagesPl.php rename to languages/messages/MessagesPl.php diff --git a/languages/MessagesPms.php b/languages/messages/MessagesPms.php similarity index 100% rename from languages/MessagesPms.php rename to languages/messages/MessagesPms.php diff --git a/languages/MessagesPs.php b/languages/messages/MessagesPs.php similarity index 100% rename from languages/MessagesPs.php rename to languages/messages/MessagesPs.php diff --git a/languages/MessagesPt.php b/languages/messages/MessagesPt.php similarity index 100% rename from languages/MessagesPt.php rename to languages/messages/MessagesPt.php diff --git a/languages/MessagesPt_br.php b/languages/messages/MessagesPt_br.php similarity index 100% rename from languages/MessagesPt_br.php rename to languages/messages/MessagesPt_br.php diff --git a/languages/MessagesQu.php b/languages/messages/MessagesQu.php similarity index 100% rename from languages/MessagesQu.php rename to languages/messages/MessagesQu.php diff --git a/languages/MessagesRmy.php b/languages/messages/MessagesRmy.php similarity index 100% rename from languages/MessagesRmy.php rename to languages/messages/MessagesRmy.php diff --git a/languages/MessagesRo.php b/languages/messages/MessagesRo.php similarity index 100% rename from languages/MessagesRo.php rename to languages/messages/MessagesRo.php diff --git a/languages/MessagesRu.php b/languages/messages/MessagesRu.php similarity index 100% rename from languages/MessagesRu.php rename to languages/messages/MessagesRu.php diff --git a/languages/MessagesSc.php b/languages/messages/MessagesSc.php similarity index 100% rename from languages/MessagesSc.php rename to languages/messages/MessagesSc.php diff --git a/languages/MessagesSd.php b/languages/messages/MessagesSd.php similarity index 100% rename from languages/MessagesSd.php rename to languages/messages/MessagesSd.php diff --git a/languages/MessagesSk.php b/languages/messages/MessagesSk.php similarity index 100% rename from languages/MessagesSk.php rename to languages/messages/MessagesSk.php diff --git a/languages/MessagesSl.php b/languages/messages/MessagesSl.php similarity index 100% rename from languages/MessagesSl.php rename to languages/messages/MessagesSl.php diff --git a/languages/MessagesSq.php b/languages/messages/MessagesSq.php similarity index 100% rename from languages/MessagesSq.php rename to languages/messages/MessagesSq.php diff --git a/languages/MessagesSr.php b/languages/messages/MessagesSr.php similarity index 100% rename from languages/MessagesSr.php rename to languages/messages/MessagesSr.php diff --git a/languages/MessagesSr_ec.php b/languages/messages/MessagesSr_ec.php similarity index 100% rename from languages/MessagesSr_ec.php rename to languages/messages/MessagesSr_ec.php diff --git a/languages/MessagesSr_el.php b/languages/messages/MessagesSr_el.php similarity index 100% rename from languages/MessagesSr_el.php rename to languages/messages/MessagesSr_el.php diff --git a/languages/MessagesSr_jc.php b/languages/messages/MessagesSr_jc.php similarity index 100% rename from languages/MessagesSr_jc.php rename to languages/messages/MessagesSr_jc.php diff --git a/languages/MessagesSr_jl.php b/languages/messages/MessagesSr_jl.php similarity index 100% rename from languages/MessagesSr_jl.php rename to languages/messages/MessagesSr_jl.php diff --git a/languages/MessagesSu.php b/languages/messages/MessagesSu.php similarity index 100% rename from languages/MessagesSu.php rename to languages/messages/MessagesSu.php diff --git a/languages/MessagesSv.php b/languages/messages/MessagesSv.php similarity index 100% rename from languages/MessagesSv.php rename to languages/messages/MessagesSv.php diff --git a/languages/MessagesTa.php b/languages/messages/MessagesTa.php similarity index 100% rename from languages/MessagesTa.php rename to languages/messages/MessagesTa.php diff --git a/languages/MessagesTe.php b/languages/messages/MessagesTe.php similarity index 100% rename from languages/MessagesTe.php rename to languages/messages/MessagesTe.php diff --git a/languages/MessagesTg.php b/languages/messages/MessagesTg.php similarity index 100% rename from languages/MessagesTg.php rename to languages/messages/MessagesTg.php diff --git a/languages/MessagesTh.php b/languages/messages/MessagesTh.php similarity index 100% rename from languages/MessagesTh.php rename to languages/messages/MessagesTh.php diff --git a/languages/MessagesTlh.php b/languages/messages/MessagesTlh.php similarity index 100% rename from languages/MessagesTlh.php rename to languages/messages/MessagesTlh.php diff --git a/languages/MessagesTr.php b/languages/messages/MessagesTr.php similarity index 100% rename from languages/MessagesTr.php rename to languages/messages/MessagesTr.php diff --git a/languages/MessagesTt.php b/languages/messages/MessagesTt.php similarity index 100% rename from languages/MessagesTt.php rename to languages/messages/MessagesTt.php diff --git a/languages/MessagesTyv.php b/languages/messages/MessagesTyv.php similarity index 100% rename from languages/MessagesTyv.php rename to languages/messages/MessagesTyv.php diff --git a/languages/MessagesUdm.php b/languages/messages/MessagesUdm.php similarity index 100% rename from languages/MessagesUdm.php rename to languages/messages/MessagesUdm.php diff --git a/languages/MessagesUg.php b/languages/messages/MessagesUg.php similarity index 100% rename from languages/MessagesUg.php rename to languages/messages/MessagesUg.php diff --git a/languages/MessagesUk.php b/languages/messages/MessagesUk.php similarity index 100% rename from languages/MessagesUk.php rename to languages/messages/MessagesUk.php diff --git a/languages/MessagesUr.php b/languages/messages/MessagesUr.php similarity index 100% rename from languages/MessagesUr.php rename to languages/messages/MessagesUr.php diff --git a/languages/MessagesVec.php b/languages/messages/MessagesVec.php similarity index 100% rename from languages/MessagesVec.php rename to languages/messages/MessagesVec.php diff --git a/languages/MessagesVi.php b/languages/messages/MessagesVi.php similarity index 100% rename from languages/MessagesVi.php rename to languages/messages/MessagesVi.php diff --git a/languages/MessagesWa.php b/languages/messages/MessagesWa.php similarity index 100% rename from languages/MessagesWa.php rename to languages/messages/MessagesWa.php diff --git a/languages/MessagesXal.php b/languages/messages/MessagesXal.php similarity index 100% rename from languages/MessagesXal.php rename to languages/messages/MessagesXal.php diff --git a/languages/MessagesYi.php b/languages/messages/MessagesYi.php similarity index 100% rename from languages/MessagesYi.php rename to languages/messages/MessagesYi.php diff --git a/languages/MessagesZa.php b/languages/messages/MessagesZa.php similarity index 100% rename from languages/MessagesZa.php rename to languages/messages/MessagesZa.php diff --git a/languages/MessagesZh.php b/languages/messages/MessagesZh.php similarity index 100% rename from languages/MessagesZh.php rename to languages/messages/MessagesZh.php diff --git a/languages/MessagesZh_cn.php b/languages/messages/MessagesZh_cn.php similarity index 100% rename from languages/MessagesZh_cn.php rename to languages/messages/MessagesZh_cn.php diff --git a/languages/MessagesZh_hk.php b/languages/messages/MessagesZh_hk.php similarity index 100% rename from languages/MessagesZh_hk.php rename to languages/messages/MessagesZh_hk.php diff --git a/languages/MessagesZh_sg.php b/languages/messages/MessagesZh_sg.php similarity index 100% rename from languages/MessagesZh_sg.php rename to languages/messages/MessagesZh_sg.php diff --git a/languages/MessagesZh_tw.php b/languages/messages/MessagesZh_tw.php similarity index 100% rename from languages/MessagesZh_tw.php rename to languages/messages/MessagesZh_tw.php diff --git a/languages/MessagesZh_yue.php b/languages/messages/MessagesZh_yue.php similarity index 100% rename from languages/MessagesZh_yue.php rename to languages/messages/MessagesZh_yue.php diff --git a/languages/scripts/date-formats.php b/languages/scripts/date-formats.php index dd3fb7f5c1..962c2f8ccb 100644 --- a/languages/scripts/date-formats.php +++ b/languages/scripts/date-formats.php @@ -6,7 +6,7 @@ $ts = '20010115123456'; $IP = dirname( __FILE__ ) . '/../..'; require_once( "$IP/maintenance/commandLine.inc" ); -foreach ( glob( "$IP/languages/Messages*.php" ) as $filename ) { +foreach ( glob( "$IP/languages/messages/Messages*.php" ) as $filename ) { $base = basename( $filename ); if ( !preg_match( '/Messages(.*)\.php$/', $base, $m ) ) { continue; diff --git a/maintenance/checktrans.php b/maintenance/checktrans.php index 61d8bab212..e35c4940c6 100644 --- a/maintenance/checktrans.php +++ b/maintenance/checktrans.php @@ -21,7 +21,7 @@ if ( $code == 'en' ) { exit(); } -$filename = Language::getFileName( "$IP/languages/Messages", $code, '.php' ); +$filename = Language::getMessagesFileName( $code ); if ( file_exists( $filename ) ) { require( $filename ); } else { diff --git a/maintenance/diffLanguage.php b/maintenance/diffLanguage.php index 92af31e564..96db0c6c8b 100644 --- a/maintenance/diffLanguage.php +++ b/maintenance/diffLanguage.php @@ -80,7 +80,7 @@ function getMediawikiMessages($languageCode = 'En') { // it might already be loaded in LocalSettings.php if(!isset($$foo)) { global $IP; - $langFile = $IP.'/languages/Language'.$languageCode.'.php'; + $langFile = $IP.'/languages/classes/Language'.$languageCode.'.php'; if (file_exists( $langFile ) ) { print "Including $langFile\n"; global $wgNamespaceNamesEn; diff --git a/maintenance/duplicatetrans.php b/maintenance/duplicatetrans.php index e36b929c76..8729ada7b4 100644 --- a/maintenance/duplicatetrans.php +++ b/maintenance/duplicatetrans.php @@ -20,7 +20,7 @@ if ( $code == 'en' ) { exit(); } -$filename = Language::getFileName( "$IP/languages/Messages", $code, '.php' ); +$filename = Language::getMessagesFileName( $code ); if ( file_exists( $filename ) ) { require( $filename ); } else { diff --git a/maintenance/lang2po.php b/maintenance/lang2po.php index b3448245ae..4054059ff2 100644 --- a/maintenance/lang2po.php +++ b/maintenance/lang2po.php @@ -137,7 +137,7 @@ $langTool = new languages(); // Do all languages foreach ( $langTool->getMessages() as $langcode) { echo "Loading messages for $langcode:\t"; - require_once( Language::getFileName( "$IP/languages/Language", $langcode, ".php" ) ); + require_once( Language::getClassFileName( $langcode ) ); $arr = 'wgAllMessages'.$langcode; if(!@is_array($$arr)) { echo "NONE FOUND\n"; diff --git a/maintenance/langmemusage.php b/maintenance/langmemusage.php index 82030f9ec1..44b80c595a 100644 --- a/maintenance/langmemusage.php +++ b/maintenance/langmemusage.php @@ -18,7 +18,7 @@ $memlast = $memstart = memory_get_usage(); print 'Base memory usage: '.$memstart."\n"; foreach ( $langtool->getLanguages() as $langcode ) { - require_once( Language::getFileName( "$IP/languages/Language", $langcode, ".php" ) ); + require_once( Language::getClassFileName( $langcode ) ); $memstep = memory_get_usage(); printf( "%12s: %d\n", $langcode, ($memstep- $memlast) ); $memlast = $memstep; diff --git a/maintenance/languages.inc b/maintenance/languages.inc index c0e7d74e23..9d295a64b1 100644 --- a/maintenance/languages.inc +++ b/maintenance/languages.inc @@ -300,13 +300,7 @@ class languages { * @param $exif Treat the EXIF messages? */ function __construct( $exif = true ) { - global $IP; - $dir = opendir( "$IP/languages" ); - while ( $file = readdir( $dir ) ) { - if ( preg_match( "/Messages([^.]*?)\.php$/", $file, $matches ) ) { - $this->mLanguages[] = str_replace( '_', '-', strtolower( substr( $matches[1], 0, 1 ) ) . substr( $matches[1], 1 ) ); - } - } + $this->mLanguages = array_keys( Language::getLanguageNames( true ) ); sort( $this->mLanguages ); if ( !$exif ) { $this->mOptionalMessages = array_merge( $this->mOptionalMessages, $this->mEXIFMessages ); @@ -331,8 +325,7 @@ class languages { if ( isset( $this->mRawMessages[$code] ) ) { return; } - global $IP; - $filename = Language::getFileName( "$IP/languages/Messages", $code, '.php' ); + $filename = Language::getMessagesFileName( $code ); if ( file_exists( $filename ) ) { require( $filename ); if ( isset( $messages ) ) { diff --git a/maintenance/unusedMessages.php b/maintenance/unusedMessages.php index fc3749d265..3ba28a9508 100644 --- a/maintenance/unusedMessages.php +++ b/maintenance/unusedMessages.php @@ -19,7 +19,7 @@ if ( $code == 'en' ) { exit(); } -$filename = Language::getFileName( "$IP/languages/Messages", $code, '.php' ); +$filename = Language::getMessagesFileName( $code ); if ( file_exists( $filename ) ) { require( $filename ); } else { -- 2.20.1