(bug 120781) Move 'mainpagetext' messages to installer's .i18n file.

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 14e368d..841c637 100644 (file)
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -157,6 +157,7 @@ production.
   are disabled for user pages.
 * (bug 12205) Bidirectional names in action=credits are split and displayed
   incorrectly when wrapped to the next line.
+* (bug 120781) Move 'mainpagetext' messages to installer's .i18n file.
 
 === API changes in 1.19 ===
 * BREAKING CHANGE: action=watch now requires POST and token.

diff --git a/includes/installer/Installer.i18n.php b/includes/installer/Installer.i18n.php
index e376ae9..95ffa70 100644 (file)
--- a/includes/installer/Installer.i18n.php
+++ b/includes/installer/Installer.i18n.php
@@ -540,6 +540,13 @@ $3
 When that has been done, you can '''[$2 enter your wiki]'''.",
        'config-download-localsettings' => 'Download LocalSettings.php',
        'config-help' => 'help',
+       'mainpagetext'      => "'''MediaWiki has been successfully installed.'''",
+       'mainpagedocfooter' => "Consult the [http://meta.wikimedia.org/wiki/Help:Contents User's Guide] for information on using the wiki software.
+
+== Getting started ==
+* [http://www.mediawiki.org/wiki/Manual:Configuration_settings Configuration settings list]
+* [http://www.mediawiki.org/wiki/Manual:FAQ MediaWiki FAQ]
+* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki release mailing list]",
 );
 
 /** Message documentation (Message documentation)

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index b3f294d..1b5e0b4 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -744,13 +744,6 @@ XHTML id names.
 'broken-file-category'           => 'Pages with broken file links',
 
 'linkprefix'        => '/^(.*?)([a-zA-Z\\x80-\\xff]+)$/sD', # only translate this message to other languages if you have to change it
-'mainpagetext'      => "'''MediaWiki has been successfully installed.'''",
-'mainpagedocfooter' => "Consult the [http://meta.wikimedia.org/wiki/Help:Contents User's Guide] for information on using the wiki software.
-
-== Getting started ==
-* [http://www.mediawiki.org/wiki/Manual:Configuration_settings Configuration settings list]
-* [http://www.mediawiki.org/wiki/Manual:FAQ MediaWiki FAQ]
-* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki release mailing list]",
 
 'about'         => 'About',
 'article'       => 'Content page',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index f996d4d..54ff50f 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -161,8 +161,6 @@ $wgMessageStructure = array(
        ),
        'mainpage' => array(
                'linkprefix',
-               'mainpagetext',
-               'mainpagedocfooter',
        ),
        'miscellaneous1' => array(
                'about',