r45229 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r45228‎ | r45229 | r45230 >
Date:17:20, 31 December 2008
Author:siebrand
Status:ok
Tags:
Comment:
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
Modified paths:
  • /trunk/phase3/includes/EditPage.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesEn.php (modified) (history)

Diff [purge]

Index: trunk/phase3/languages/messages/MessagesEn.php
@@ -1024,8 +1024,8 @@
10251025 'hr_tip' => 'Horizontal line (use sparingly)',
10261026
10271027 # Edit pages
1028 -'summary' => 'Summary',
1029 -'subject' => 'Subject/headline',
 1028+'summary' => 'Summary:',
 1029+'subject' => 'Subject/headline:',
10301030 'minoredit' => 'This is a minor edit',
10311031 'watchthis' => 'Watch this page',
10321032 'savearticle' => 'Save page',
@@ -1040,8 +1040,8 @@
10411041 'missingcommenttext' => 'Please enter a comment below.',
10421042 'missingcommentheader' => "'''Reminder:''' You have not provided a subject/headline for this comment.
10431043 If you click Save again, your edit will be saved without one.",
1044 -'summary-preview' => 'Summary preview',
1045 -'subject-preview' => 'Subject/headline preview',
 1044+'summary-preview' => 'Summary preview:',
 1045+'subject-preview' => 'Subject/headline preview:',
10461046 'blockedtitle' => 'User is blocked',
10471047 'blockedtext' => "<big>'''Your user name or IP address has been blocked.'''</big>
10481048
Index: trunk/phase3/includes/EditPage.php
@@ -1258,9 +1258,8 @@
12591259 #if ( "no" == $redirect ) { $q .= "&redirect=no"; }
12601260 $action = $wgTitle->escapeLocalURL( $q );
12611261
1262 - $colonSep = wfMsg( 'colon-separator' );
1263 - $summary = wfMsg( 'summary' ) . $colonSep;
1264 - $subject = wfMsg( 'subject' ) . $colonSep;
 1262+ $summary = wfMsg( 'summary' );
 1263+ $subject = wfMsg( 'subject' );
12651264
12661265 $cancel = $sk->makeKnownLink( $wgTitle->getPrefixedText(),
12671266 wfMsgExt('cancel', array('parseinline')) );
@@ -1337,12 +1336,12 @@
13381337 $editsummary = "<div class='editOptions'>\n";
13391338 global $wgParser;
13401339 $formattedSummary = wfMsgForContent( 'newsectionsummary', $wgParser->stripSectionName( $this->summary ) );
1341 - $subjectpreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">".wfMsg('subject-preview').$colonSep.$sk->commentBlock( $formattedSummary, $this->mTitle, true )."</div>\n" : '';
 1340+ $subjectpreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">". wfMsg('subject-preview') . $sk->commentBlock( $formattedSummary, $this->mTitle, true )."</div>\n" : '';
13421341 $summarypreview = '';
13431342 } else {
13441343 $commentsubject = '';
13451344 $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 />";
1346 - $summarypreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">".wfMsg('summary-preview').$colonSep.$sk->commentBlock( $this->summary, $this->mTitle )."</div>\n" : '';
 1345+ $summarypreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">". wfMsg('summary-preview') .$sk->commentBlock( $this->summary, $this->mTitle )."</div>\n" : '';
13471346 $subjectpreview = '';
13481347 }
13491348

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r45027* summary and subject messages now uses wiki text rather than raw HTML...ialex15:22, 25 December 2008
r45228Revert r45027, r45028 "* summary and subject messages now uses wiki text rath...brion17:10, 31 December 2008

Status & tagging log