* Rename "namespaceprotectedtext" to "namespaceprotected"

* Simpler default message text that covers more cases - message might be shown to logged-in users who don't have permissions, etc.

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index a181d6d..c6724cd 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -982,7 +982,7 @@ class OutputPage {
                                $ns = $wgTitle->getNamespace() == NS_MAIN
                                        ? wfMsg( 'nstab-main' )
                                        : $wgTitle->getNsText();
-                               $this->addWikiText( wfMsg( 'namespaceprotectedtext', $ns,
+                               $this->addWikiText( wfMsg( 'namespaceprotected', $ns,
                                        implode( ', ', $wgNamespaceProtection[ $wgTitle->getNamespace() ] ) ) );
                        } else {
                                // Standard protection

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 18b4d5e..1a143b7 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -785,7 +785,7 @@ Query: $2',
 'editinginterface'     => "'''Warning:''' You are editing a page which is used to provide interface text for the software. Changes to this page will affect the appearance of the user interface for other users.",
 'sqlhidden'            => '(SQL query hidden)',
 'cascadeprotected'     => 'This page has been protected from editing, because it is included in the following {{PLURAL:$1|page|pages}}, which are protected with the "cascading" option turned on:',
-'namespaceprotectedtext'=>'Because this page resides in the $1 namespace, editing of it has been restricted to users with the rights "$2". Please [[Special:Userlogin|log-in]] or contact an administrator to request permission to edit it.',
+'namespaceprotected' => "You do not have permission to edit pages in the '''$1''' namespace.",
 
 # Login and logout pages
 'logouttitle'                => 'User logout',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index aa5eb3e..ee04e5e 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -315,6 +315,7 @@ $wgMessageStructure = array(
                'viewsource',
                'viewsourcefor',
                'protectedpagetext',
+               'namespaceprotected',
                'viewsourcetext',
                'protectedinterface',
                'editinginterface',