From 66796c313c30d1d14d7062be2666ac8e9f2dc2ef Mon Sep 17 00:00:00 2001
From: Adam Miller <adam@users.mediawiki.org>
Date: Tue, 31 Aug 2010 21:52:51 +0000
Subject: [PATCH] Fix for bug 24906

---
 languages/messages/MessagesEn.php | 11 -----------
 maintenance/language/messages.inc | 11 -----------
 skins/Vector.php                  |  6 +++---
 3 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index a9b490ae88..0fea596921 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -788,17 +788,6 @@ XHTML id names.
 'vector-action-protect'          => 'Protect',
 'vector-action-undelete'         => 'Undelete',
 'vector-action-unprotect'        => 'Unprotect',
-'vector-namespace-category'      => 'Category',
-'vector-namespace-help'          => 'Help page',
-'vector-namespace-image'         => 'File',
-'vector-namespace-main'          => 'Page',
-'vector-namespace-media'         => 'Media page',
-'vector-namespace-mediawiki'     => 'Message',
-'vector-namespace-project'       => 'Project page',
-'vector-namespace-special'       => 'Special page',
-'vector-namespace-talk'          => 'Discussion',
-'vector-namespace-template'      => 'Template',
-'vector-namespace-user'          => 'User page',
 'vector-simplesearch-preference' => 'Enable enhanced search suggestions (Vector skin only)',
 'vector-view-create'             => 'Create',
 'vector-view-edit'               => 'Edit',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 7f3359f265..b8a8a6f1fc 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -179,17 +179,6 @@ $wgMessageStructure = array(
 		'vector-action-protect',
 		'vector-action-undelete',
 		'vector-action-unprotect',
-		'vector-namespace-category',
-		'vector-namespace-help',
-		'vector-namespace-image',
-		'vector-namespace-main',
-		'vector-namespace-media',
-		'vector-namespace-mediawiki',
-		'vector-namespace-project',
-		'vector-namespace-special',
-		'vector-namespace-talk',
-		'vector-namespace-template',
-		'vector-namespace-user',
 		'vector-simplesearch-preference',
 		'vector-view-create',
 		'vector-view-edit',
diff --git a/skins/Vector.php b/skins/Vector.php
index 3479ba58f7..4662fd9fe6 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -106,11 +106,11 @@ class SkinVector extends SkinTemplate {
 
 			// Adds namespace links
 			$links['namespaces'][$subjectId] = $this->tabAction(
-				$subjectPage, 'vector-namespace-' . $subjectId, !$isTalk, '', true
+				$subjectPage, 'nstab-' . $subjectId, !$isTalk, '', true
 			);
 			$links['namespaces'][$subjectId]['context'] = 'subject';
 			$links['namespaces'][$talkId] = $this->tabAction(
-				$talkPage, 'vector-namespace-talk', $isTalk, '', true
+				$talkPage, 'nstab-talk', $isTalk, '', true
 			);
 			$links['namespaces'][$talkId]['context'] = 'talk';
 
@@ -312,7 +312,7 @@ class SkinVector extends SkinTemplate {
 		} else {
 			$links['namespaces']['special'] = array(
 				'class' => 'selected',
-				'text' => wfMsg( 'vector-namespace-special' ),
+				'text' => wfMsg( 'nstab-special' ),
 				'href' => $wgRequest->getRequestURL()
 			);
 		}
-- 
2.20.1