Switched language of tabs from generic and monobook specific stuff to vector specific...

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 020c39a..a8bd391 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -650,6 +650,29 @@ XHTML id names.
 'sitetitle'      => '{{SITENAME}}', # do not translate or duplicate this message to other languages
 'sitesubtitle'   => '', # do not translate or duplicate this message to other languages
 
+'vector-action-addsection'   => 'Add Topic',
+'vector-action-delete'       => 'Delete',
+'vector-action-move'         => 'Move',
+'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-view-create'         => 'Create',
+'vector-view-edit'           => 'Edit',
+'vector-view-history'        => 'View History',
+'vector-view-view'           => 'Read',
+'vector-view-viewsource'     => 'View Source',
+
 # Metadata in edit box
 'metadata_help' => 'Metadata:',
 
@@ -669,7 +692,6 @@ XHTML id names.
 'permalink'         => 'Permanent link',
 'print'             => 'Print',
 'edit'              => 'Edit',
-'view'              => 'Read',
 'create'            => 'Create',
 'editthispage'      => 'Edit this page',
 'create-this-page'  => 'Create this page',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index d317e53..9ab8423 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -164,6 +164,30 @@ $wgMessageStructure = array(
                'sitetitle',
                'sitesubtitle',
        ),
+       'vector' => array(
+               'vector-action-addsection',
+               'vector-action-delete',
+               'vector-action-move',
+               '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-view-create',
+               'vector-view-edit',
+               'vector-view-history',
+               'vector-view-view',
+               'vector-view-viewsource',
+       ),
        'metadata_help' => array(
                'metadata_help',
        ),

diff --git a/skins/Vector.php b/skins/Vector.php
index c6b04c8..6d68b9d 100644 (file)
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -83,20 +83,20 @@ class SkinVector extends SkinTemplate {
 
                        // Adds namespace links
                        $links['namespaces'][$subjectId] = $this->tabAction(
-                               $subjectPage, 'nstab-' . $subjectId, !$isTalk, '', true
+                               $subjectPage, 'vector-namespace-' . $subjectId, !$isTalk, '', true
                        );
                        $links['namespaces'][$talkId] = $this->tabAction(
-                               $talkPage, 'talk', $isTalk, '', true
+                               $talkPage, 'vector-namespace-talk', $isTalk, '', true
                        );
 
                        // Adds view view link
                        if ( $this->mTitle->exists() ) {
                                $links['views']['view'] = $this->tabAction(
                                        $isTalk ? $talkPage : $subjectPage,
-                                               'view', ( $action == 'view' ), '', true
+                                               'vector-view-view', ( $action == 'view' ), '', true
                                );
                        }
-
+                       
                        wfProfileIn( __METHOD__ . '-edit' );
 
                        // Checks if user can...
@@ -121,8 +121,8 @@ class SkinVector extends SkinTemplate {
                                $links['views']['edit'] = array(
                                        'class' => ( $selected ? 'selected' : '' ) . $isTalkClass,
                                        'text' => $this->mTitle->exists()
-                                               ? wfMsg( 'edit' )
-                                               : wfMsg( 'create' ),
+                                               ? wfMsg( 'vector-view-edit' )
+                                               : wfMsg( 'vector-view-create' ),
                                        'href' =>
                                                $this->mTitle->getLocalUrl( $this->editUrlOptions() )
                                );
@@ -134,7 +134,7 @@ class SkinVector extends SkinTemplate {
                                                // Adds new section link
                                                $links['actions']['addsection'] = array(
                                                        'class' => $section == 'new' ? 'selected' : false,
-                                                       'text' => wfMsg( 'addsection' ),
+                                                       'text' => wfMsg( 'vector-action-addsection' ),
                                                        'href' => $this->mTitle->getLocalUrl(
                                                                'action=edit&section=new'
                                                        )
@@ -146,7 +146,7 @@ class SkinVector extends SkinTemplate {
                                // Adds view source view link
                                $links['views']['viewsource'] = array(
                                        'class' => ( $action == 'edit' ) ? 'selected' : false,
-                                       'text' => wfMsg( 'viewsource' ),
+                                       'text' => wfMsg( 'vector-view-viewsource' ),
                                        'href' =>
                                                $this->mTitle->getLocalUrl( $this->editUrlOptions() )
                                );
@@ -160,7 +160,7 @@ class SkinVector extends SkinTemplate {
                                // Adds history view link
                                $links['views']['history'] = array(
                                        'class' => ($action == 'history') ? 'selected' : false,
-                                       'text' => wfMsg( 'history_short' ),
+                                       'text' => wfMsg( 'vector-view-history' ),
                                        'href' => $this->mTitle->getLocalUrl( 'action=history' ),
                                        'rel' => 'archives',
                                );
@@ -168,7 +168,7 @@ class SkinVector extends SkinTemplate {
                                if( $wgUser->isAllowed( 'delete' ) ) {
                                        $links['actions']['delete'] = array(
                                                'class' => ($action == 'delete') ? 'selected' : false,
-                                               'text' => wfMsg( 'delete' ),
+                                               'text' => wfMsg( 'vector-action-delete' ),
                                                'href' => $this->mTitle->getLocalUrl( 'action=delete' )
                                        );
                                }
@@ -179,7 +179,7 @@ class SkinVector extends SkinTemplate {
                                        $links['actions']['move'] = array(
                                                'class' => $this->mTitle->isSpecial( 'Movepage' ) ?
                                                                                'selected' : false,
-                                               'text' => wfMsg( 'move' ),
+                                               'text' => wfMsg( 'vector-action-move' ),
                                                'href' => $moveTitle->getLocalUrl()
                                        );
                                }
@@ -192,7 +192,7 @@ class SkinVector extends SkinTemplate {
                                                $links['actions']['protect'] = array(
                                                        'class' => ($action == 'protect') ?
                                                                                        'selected' : false,
-                                                       'text' => wfMsg( 'protect' ),
+                                                       'text' => wfMsg( 'vector-action-protect' ),
                                                        'href' =>
                                                                $this->mTitle->getLocalUrl( 'action=protect' )
                                                );
@@ -201,7 +201,7 @@ class SkinVector extends SkinTemplate {
                                                $links['actions']['unprotect'] = array(
                                                        'class' => ($action == 'unprotect') ?
                                                                                        'selected' : false,
-                                                       'text' => wfMsg( 'unprotect' ),
+                                                       'text' => wfMsg( 'vector-action-unprotect' ),
                                                        'href' =>
                                                                $this->mTitle->getLocalUrl( 'action=unprotect' )
                                                );
@@ -218,7 +218,7 @@ class SkinVector extends SkinTemplate {
                                                $links['actions']['undelete'] = array(
                                                        'class' => false,
                                                        'text' => wfMsgExt(
-                                                               'undelete_short',
+                                                               'vector-action-undelete',
                                                                array( 'parsemag' ),
                                                                $wgLang->formatNum( $n )
                                                        ),
@@ -237,7 +237,7 @@ class SkinVector extends SkinTemplate {
                                                $links['actions']['protect'] = array(
                                                        'class' => ($action == 'protect') ?
                                                                                        'selected' : false,
-                                                       'text' => wfMsg( 'protect' ),
+                                                       'text' => wfMsg( 'vector-action-protect' ),
                                                        'href' =>
                                                                $this->mTitle->getLocalUrl( 'action=protect' )
                                                );
@@ -246,7 +246,7 @@ class SkinVector extends SkinTemplate {
                                                $links['actions']['unprotect'] = array(
                                                        'class' => ($action == 'unprotect') ?
                                                                                        'selected' : false,
-                                                       'text' => wfMsg( 'unprotect' ),
+                                                       'text' => wfMsg( 'vector-action-unprotect' ),
                                                        'href' =>
                                                                $this->mTitle->getLocalUrl( 'action=unprotect' )
                                                );
@@ -254,7 +254,16 @@ class SkinVector extends SkinTemplate {
                                }
                        }
                        wfProfileOut( __METHOD__ . '-live' );
-
+                       
+                       /**
+                        * The following actions use messages which, if made particular to
+                        * the Vector skin, would break the Ajax code which makes this
+                        * action happen entirely inline. Skin::makeGlobalVariablesScript
+                        * defines a set of messages in a javascript object - and these
+                        * messages are assumed to be global for all skins. Without making
+                        * a change to that procedure these messages will have to remain as
+                        * the global versions.
+                        */
                        // Checks if the user is logged in
                        if( $this->loggedin ) {
                                // Checks if the user is watching this page
@@ -283,7 +292,7 @@ class SkinVector extends SkinTemplate {
                } else {
                        $links['namespaces']['special'] = array(
                                'class' => 'selected',
-                               'text' => wfMsg( 'nstab-special' ),
+                               'text' => wfMsg( 'vector-namespace-special' ),
                                'href' => $wgRequest->getRequestURL()
                        );
                }