From 2575420772dfd6216b1b06a1f6561a464c012bb5 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Wed, 4 Oct 2006 02:21:41 +0000 Subject: [PATCH] Moved language-related command-line scripts to their own directory. --- RELEASE-NOTES | 3 ++- maintenance/{ => language}/checkLanguage.php | 2 +- maintenance/{ => language}/checktrans.php | 2 +- {languages/scripts => maintenance/language}/date-formats.php | 0 maintenance/{ => language}/diffLanguage.php | 4 ++-- maintenance/{ => language}/dumpMessages.php | 2 +- maintenance/{ => language}/duplicatetrans.php | 2 +- {languages/scripts => maintenance/language}/function-list.php | 0 maintenance/{ => language}/lang2po.php | 4 ++-- maintenance/{ => language}/langmemusage.php | 4 ++-- maintenance/{ => language}/languages.inc | 0 maintenance/{ => language}/splitLanguageFiles.inc | 0 maintenance/{ => language}/splitLanguageFiles.php | 2 +- maintenance/{ => language}/unusedMessages.php | 2 +- {languages/scripts => maintenance/language}/validate.php | 0 15 files changed, 14 insertions(+), 13 deletions(-) rename maintenance/{ => language}/checkLanguage.php (99%) rename maintenance/{ => language}/checktrans.php (94%) rename {languages/scripts => maintenance/language}/date-formats.php (100%) rename maintenance/{ => language}/diffLanguage.php (97%) rename maintenance/{ => language}/dumpMessages.php (86%) rename maintenance/{ => language}/duplicatetrans.php (93%) rename {languages/scripts => maintenance/language}/function-list.php (100%) rename maintenance/{ => language}/lang2po.php (97%) rename maintenance/{ => language}/langmemusage.php (86%) rename maintenance/{ => language}/languages.inc (100%) rename maintenance/{ => language}/splitLanguageFiles.inc (100%) rename maintenance/{ => language}/splitLanguageFiles.php (83%) rename maintenance/{ => language}/unusedMessages.php (93%) rename {languages/scripts => maintenance/language}/validate.php (100%) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index c253ff3f3f..7bafce986c 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -257,7 +257,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * (bug 6617) Validate timestamps on Special:Undelete * Do fewer unnecessary full writes of user rows; only update user_touched for watch/unwatch, group membership change, and login operations - +* Restructured the languages directory, to avoid problems when people + untar MW 1.8 over the top of a 1.7 installation. == Languages updated == diff --git a/maintenance/checkLanguage.php b/maintenance/language/checkLanguage.php similarity index 99% rename from maintenance/checkLanguage.php rename to maintenance/language/checkLanguage.php index 8e489b7be6..11c8ec92c2 100644 --- a/maintenance/checkLanguage.php +++ b/maintenance/language/checkLanguage.php @@ -6,7 +6,7 @@ * @subpackage Maintenance */ -require_once( 'commandLine.inc' ); +require_once( dirname(__FILE__).'/../commandLine.inc' ); require_once( 'languages.inc' ); /** diff --git a/maintenance/checktrans.php b/maintenance/language/checktrans.php similarity index 94% rename from maintenance/checktrans.php rename to maintenance/language/checktrans.php index e35c4940c6..a5772d47ff 100644 --- a/maintenance/checktrans.php +++ b/maintenance/language/checktrans.php @@ -8,7 +8,7 @@ */ /** */ -require_once('commandLine.inc'); +require_once(dirname(__FILE__).'/../commandLine.inc'); if ( isset( $args[0] ) ) { $code = $args[0]; diff --git a/languages/scripts/date-formats.php b/maintenance/language/date-formats.php similarity index 100% rename from languages/scripts/date-formats.php rename to maintenance/language/date-formats.php diff --git a/maintenance/diffLanguage.php b/maintenance/language/diffLanguage.php similarity index 97% rename from maintenance/diffLanguage.php rename to maintenance/language/diffLanguage.php index 96db0c6c8b..2aaa5902a8 100644 --- a/maintenance/diffLanguage.php +++ b/maintenance/language/diffLanguage.php @@ -40,8 +40,8 @@ */ /** This script run from the commandline */ -require_once( 'parserTests.inc' ); -require_once( 'commandLine.inc' ); +require_once( dirname(__FILE__).'/../parserTests.inc' ); +require_once( dirname(__FILE__).'/../commandLine.inc' ); if( isset($options['help']) ) { usage(); wfDie(); } diff --git a/maintenance/dumpMessages.php b/maintenance/language/dumpMessages.php similarity index 86% rename from maintenance/dumpMessages.php rename to maintenance/language/dumpMessages.php index f273c71e03..bd7e2aeda6 100644 --- a/maintenance/dumpMessages.php +++ b/maintenance/language/dumpMessages.php @@ -6,7 +6,7 @@ */ /** */ -require_once( "commandLine.inc" ); +require_once( dirname(__FILE__).'/../commandLine.inc' ); $wgMessageCache->disableTransform(); $messages = array(); $wgEnglishMessages = array_keys( Language::getMessagesFor( 'en' ) ); diff --git a/maintenance/duplicatetrans.php b/maintenance/language/duplicatetrans.php similarity index 93% rename from maintenance/duplicatetrans.php rename to maintenance/language/duplicatetrans.php index 8729ada7b4..9273ee6e91 100644 --- a/maintenance/duplicatetrans.php +++ b/maintenance/language/duplicatetrans.php @@ -7,7 +7,7 @@ * @subpackage Maintenance */ -require_once('commandLine.inc'); +require_once(dirname(__FILE__).'/../commandLine.inc'); if ( isset( $args[0] ) ) { $code = $args[0]; diff --git a/languages/scripts/function-list.php b/maintenance/language/function-list.php similarity index 100% rename from languages/scripts/function-list.php rename to maintenance/language/function-list.php diff --git a/maintenance/lang2po.php b/maintenance/language/lang2po.php similarity index 97% rename from maintenance/lang2po.php rename to maintenance/language/lang2po.php index 4054059ff2..520d8d6e57 100644 --- a/maintenance/lang2po.php +++ b/maintenance/language/lang2po.php @@ -8,8 +8,8 @@ */ /** This is a command line script */ -require_once('commandLine.inc'); -require_once('languages.inc'); +require_once(dirname(__FILE__).'/../commandLine.inc'); +require_once(dirname(__FILE__).'/languages.inc'); define('ALL_LANGUAGES', true); define('XGETTEXT_BIN', 'xgettext'); diff --git a/maintenance/langmemusage.php b/maintenance/language/langmemusage.php similarity index 86% rename from maintenance/langmemusage.php rename to maintenance/language/langmemusage.php index 44b80c595a..974bb0d832 100644 --- a/maintenance/langmemusage.php +++ b/maintenance/language/langmemusage.php @@ -5,8 +5,8 @@ */ /** This is a command line script */ -require_once('commandLine.inc'); -require_once('languages.inc'); +require_once(dirname(__FILE__).'/../commandLine.inc'); +require_once(dirname(__FILE__).'/languages.inc'); $langtool = new languages(); diff --git a/maintenance/languages.inc b/maintenance/language/languages.inc similarity index 100% rename from maintenance/languages.inc rename to maintenance/language/languages.inc diff --git a/maintenance/splitLanguageFiles.inc b/maintenance/language/splitLanguageFiles.inc similarity index 100% rename from maintenance/splitLanguageFiles.inc rename to maintenance/language/splitLanguageFiles.inc diff --git a/maintenance/splitLanguageFiles.php b/maintenance/language/splitLanguageFiles.php similarity index 83% rename from maintenance/splitLanguageFiles.php rename to maintenance/language/splitLanguageFiles.php index b80f38fc47..2263e611bb 100644 --- a/maintenance/splitLanguageFiles.php +++ b/maintenance/language/splitLanguageFiles.php @@ -7,7 +7,7 @@ * Also need to rewrite the wfMsg system / message-cache. */ -include('commandLine.inc'); +include(dirname(__FILE__).'/../commandLine.inc'); ?> diff --git a/maintenance/unusedMessages.php b/maintenance/language/unusedMessages.php similarity index 93% rename from maintenance/unusedMessages.php rename to maintenance/language/unusedMessages.php index 3ba28a9508..8b117eca7c 100644 --- a/maintenance/unusedMessages.php +++ b/maintenance/language/unusedMessages.php @@ -6,7 +6,7 @@ * @subpackage Maintenance */ -require_once('commandLine.inc'); +require_once(dirname(__FILE__).'/../commandLine.inc'); if ( isset( $args[0] ) ) { $code = $args[0]; diff --git a/languages/scripts/validate.php b/maintenance/language/validate.php similarity index 100% rename from languages/scripts/validate.php rename to maintenance/language/validate.php -- 2.20.1