From: Ævar Arnfjörð Bjarmason <avar@users.mediawiki.org>
Date: Fri, 8 Apr 2005 18:49:26 +0000 (+0000)
Subject: * Replacing NS_WP and NS_WIKIPEDIA with NS_PROJECT and NS_WP_TALK and
X-Git-Tag: 1.5.0alpha1~341
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_add%27%29%20%7D%7D?a=commitdiff_plain;h=c009cdf4ddb1ced2353bec76357c7fbc39aa2009;p=lhc%2Fweb%2Fwiklou.git

* Replacing NS_WP and NS_WIKIPEDIA with NS_PROJECT and NS_WP_TALK and
  NS_WIKIPEDIA_TALK with NS_PROJECT_TALK, support for these aliases has now
  been removed.
---

diff --git a/includes/Defines.php b/includes/Defines.php
index 6bbaec8ecc..9c35f22dae 100644
--- a/includes/Defines.php
+++ b/includes/Defines.php
@@ -47,17 +47,6 @@ define('NS_CATEGORY', 14);
 define('NS_CATEGORY_TALK', 15);
 /**#@-*/
 
-/**#@+
- * Fix the code and remove these...
- * @todo Constants that need to be removed after code cleaning
- * @deprecated
- */
-define('NS_WP', NS_PROJECT);
-define('NS_WP_TALK', NS_PROJECT_TALK);
-define('NS_WIKIPEDIA', NS_PROJECT);
-define('NS_WIKIPEDIA_TALK', NS_PROJECT_TALK);
-/**#@-*/
-
 /**
  * Available feeds objects
  * Should probably only be defined when a page is syndicated ie when
diff --git a/languages/LanguageEt.php b/languages/LanguageEt.php
index 3395cd6b8b..8c34f65bdc 100644
--- a/languages/LanguageEt.php
+++ b/languages/LanguageEt.php
@@ -26,8 +26,8 @@ $wgNamespaceNamesEt = array(
         NS_TALK             => 'Arutelu',
         NS_USER             => 'Kasutaja',
         NS_USER_TALK        => 'Kasutaja_arutelu',
-        NS_WIKIPEDIA        => $wgMetaNamespace,
-        NS_WIKIPEDIA_TALK   => $wgMetaNamespace . '_arutelu',
+        NS_PROJECT          => $wgMetaNamespace,
+        NS_PROJECT_TALK     => $wgMetaNamespace . '_arutelu',
         NS_IMAGE            => 'Pilt',
         NS_IMAGE_TALK       => 'Pildi_arutelu',
         NS_MEDIAWIKI        => 'MediaWiki',
diff --git a/languages/LanguageFi.php b/languages/LanguageFi.php
index 12fa19153f..f1c29f3b26 100644
--- a/languages/LanguageFi.php
+++ b/languages/LanguageFi.php
@@ -1153,7 +1153,7 @@ require_once( 'LanguageUtf8.php' );
 class LanguageFi extends LanguageUtf8 {
 	function LanguageFi() {
 		global $wgNamespaceNamesFi, $wgMetaNamespace;
-		$wgNamespaceNamesFi[NS_WP_TALK] = 'Keskustelu_' . $this->convertGrammar( $wgMetaNamespace, 'elative' );
+		$wgNamespaceNamesFi[NS_PROJECT_TALK] = 'Keskustelu_' . $this->convertGrammar( $wgMetaNamespace, 'elative' );
 	}
 
 	function getBookstoreList () {
diff --git a/languages/LanguageUk.php b/languages/LanguageUk.php
index 2ff7fc7716..c88da06bd4 100755
--- a/languages/LanguageUk.php
+++ b/languages/LanguageUk.php
@@ -21,8 +21,8 @@ require_once( "LanguageUtf8.php" );
 	NS_TALK             => 'Обговорення',
 	NS_USER             => 'Користувач',
 	NS_USER_TALK        => 'Обговорення_користувача',
-	NS_WIKIPEDIA        => $wgMetaNamespace,
-	NS_WIKIPEDIA_TALK   => 'Обговорення_' . $wgMetaNamespace,
+	NS_PROJECT          => $wgMetaNamespace,
+	NS_PROJECT_TALK     => 'Обговорення_' . $wgMetaNamespace,
 	NS_IMAGE            => 'Зображення',
 	NS_IMAGE_TALK       => 'Обговорення_зображення',
 	NS_MEDIAWIKI        => 'MediaWiki',