Follow up r77981,r77982. Rename the new globalcsspreview/globaljspreview to sitecsspr...

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 277a915..6d2b01e 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1883,11 +1883,11 @@ HTML
                if ( $this->isCssJsSubpage || $this->mTitle->isCssOrJsPage() ) {
                        $level = 'user';
                        if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
-                               $level = 'global';
+                               $level = 'site';
                        }
 
                        # Used messages to make sure grep find them:
-                       # usercsspreview, userjspreview, globalcsspreview, globaljspreview
+                       # Messages: usercsspreview, userjspreview, sitecsspreview, sitejspreview
                        if (preg_match( "/\\.css$/", $this->mTitle->getText() ) ) {
                                $previewtext = "<div id='mw-{$level}csspreview'>\n" . wfMsg( "{$level}csspreview" ) . "\n</div>";
                                $class = "mw-code mw-css";

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index f20acf4..8f045b8 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1300,9 +1300,9 @@ The latest block log entry is provided below for reference:',
 '''It has not yet been saved!'''",
 'userjspreview'                    => "'''Remember that you are only testing/previewing your user JavaScript.'''
 '''It has not yet been saved!'''",
-'globalcsspreview'                 => "'''Remember that you are only previewing this global CSS.'''
+'sitecsspreview'                   => "'''Remember that you are only previewing this global CSS.'''
 '''It has not yet been saved!'''",
-'globaljspreview'                  => "'''Remember that you are only previewing this global JavaScript code.'''
+'sitejspreview'                    => "'''Remember that you are only previewing this global JavaScript code.'''
 '''It has not yet been saved!'''",
 'userinvalidcssjstitle'            => "'''Warning:''' There is no skin \"\$1\".
 Custom .css and .js pages use a lowercase title, e.g. {{ns:user}}:Foo/vector.css as opposed to {{ns:user}}:Foo/Vector.css.",

diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index eaabbfe..20b32f8 100644 (file)
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -841,8 +841,8 @@ See also {{msg-mw|Noarticletext-nopermission}}.',
 'userjsyoucanpreview'              => 'Text displayed on every js page.',
 'usercsspreview'                   => 'Text displayed on preview of every user .css subpage',
 'userjspreview'                    => 'Text displayed on preview of every user .js subpage',
-'globalcsspreview'                 => 'Text displayed on preview of .css pages in MediaWiki namespace',
-'globaljspreview'                  => 'Text displayed on preview of .js pages in MediaWiki namespace',
+'sitecsspreview'                   => 'Text displayed on preview of .css pages in MediaWiki namespace',
+'sitejspreview'                    => 'Text displayed on preview of .js pages in MediaWiki namespace',
 'updated'                          => '{{Identical|Updated}}',
 'previewnote'                      => 'Note displayed when clicking on Show preview',
 'editing'                          => "Shown as page title when editing a page. \$1 is the name of the page that is being edited. Example: \"''Editing Main Page''\".",

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 1cb9457..2df2ef8 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -565,8 +565,8 @@ $wgMessageStructure = array(
                'userjsyoucanpreview',
                'usercsspreview',
                'userjspreview',
-               'globalcsspreview',
-               'globaljspreview',
+               'sitecsspreview',
+               'sitejspreview',
                'userinvalidcssjstitle',
                'updated',
                'note',