From: Siebrand Mazeland <siebrand@users.mediawiki.org>
Date: Wed, 31 Dec 2008 17:20:26 +0000 (+0000)
Subject: Partial re-introduction of r45027 after being reverted in r45228
X-Git-Tag: 1.31.0-rc.0~43676
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=d2db6fcf151e2ae2e32918e229ae0b6bd2e4d855;p=lhc%2Fweb%2Fwiklou.git

Partial re-introduction of r45027 after being reverted in r45228
* Added the colon in summary, subject and subject-preview messages rather than using colon-separator
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index a8c340f8f8..ea34242476 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1258,9 +1258,8 @@ class EditPage {
 		#if ( "no" == $redirect ) { $q .= "&redirect=no"; }
 		$action = $wgTitle->escapeLocalURL( $q );
 
-		$colonSep = wfMsg( 'colon-separator' );
-		$summary = wfMsg( 'summary' ) . $colonSep;
-		$subject = wfMsg( 'subject' ) . $colonSep;
+		$summary = wfMsg( 'summary' );
+		$subject = wfMsg( 'subject' );
 
 		$cancel = $sk->makeKnownLink( $wgTitle->getPrefixedText(),
 				wfMsgExt('cancel', array('parseinline')) );
@@ -1337,12 +1336,12 @@ class EditPage {
 			$editsummary = "<div class='editOptions'>\n";
 			global $wgParser;
 			$formattedSummary = wfMsgForContent( 'newsectionsummary', $wgParser->stripSectionName( $this->summary ) );
-			$subjectpreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">".wfMsg('subject-preview').$colonSep.$sk->commentBlock( $formattedSummary, $this->mTitle, true )."</div>\n" : '';
+			$subjectpreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">". wfMsg('subject-preview') . $sk->commentBlock( $formattedSummary, $this->mTitle, true )."</div>\n" : '';
 			$summarypreview = '';
 		} else {
 			$commentsubject = '';
 			$editsummary="<div class='editOptions'>\n<span id='wpSummaryLabel'><label for='wpSummary'>{$summary}</label></span>\n<input tabindex='2' type='text' value=\"$summarytext\" name='wpSummary' id='wpSummary' maxlength='200' size='60' />{$summaryhiddens}<br />";
-			$summarypreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">".wfMsg('summary-preview').$colonSep.$sk->commentBlock( $this->summary, $this->mTitle )."</div>\n" : '';
+			$summarypreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">". wfMsg('summary-preview') .$sk->commentBlock( $this->summary, $this->mTitle )."</div>\n" : '';
 			$subjectpreview = '';
 		}
 
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 58ad226fba..204fdfee99 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1024,8 +1024,8 @@ You may have already successfully changed your password or requested a new tempo
 'hr_tip'          => 'Horizontal line (use sparingly)',
 
 # Edit pages
-'summary'                          => 'Summary',
-'subject'                          => 'Subject/headline',
+'summary'                          => 'Summary:',
+'subject'                          => 'Subject/headline:',
 'minoredit'                        => 'This is a minor edit',
 'watchthis'                        => 'Watch this page',
 'savearticle'                      => 'Save page',
@@ -1040,8 +1040,8 @@ If you click Save again, your edit will be saved without one.",
 'missingcommenttext'               => 'Please enter a comment below.',
 'missingcommentheader'             => "'''Reminder:''' You have not provided a subject/headline for this comment.
 If you click Save again, your edit will be saved without one.",
-'summary-preview'                  => 'Summary preview',
-'subject-preview'                  => 'Subject/headline preview',
+'summary-preview'                  => 'Summary preview:',
+'subject-preview'                  => 'Subject/headline preview:',
 'blockedtitle'                     => 'User is blocked',
 'blockedtext'                      => "<big>'''Your user name or IP address has been blocked.'''</big>