| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -1213,8 +1213,9 @@ |
| 1214 | 1214 | #if ( "no" == $redirect ) { $q .= "&redirect=no"; } |
| 1215 | 1215 | $action = $wgTitle->escapeLocalURL( $q ); |
| 1216 | 1216 | |
| 1217 | | - $summary = wfMsg('summary'); |
| 1218 | | - $subject = wfMsg('subject'); |
| | 1217 | + $colonSep = wfMsg( 'colon-separator' ); |
| | 1218 | + $summary = wfMsg( 'summary' ) . $colonSep; |
| | 1219 | + $subject = wfMsg( 'subject' ) . $colonSep; |
| 1219 | 1220 | |
| 1220 | 1221 | $cancel = $sk->makeKnownLink( $wgTitle->getPrefixedText(), |
| 1221 | 1222 | wfMsgExt('cancel', array('parseinline')) ); |
| — | — | @@ -1291,16 +1292,16 @@ |
| 1292 | 1293 | $autosumm = $this->autoSumm ? $this->autoSumm : md5( $this->summary ); |
| 1293 | 1294 | $summaryhiddens .= Xml::hidden( 'wpAutoSummary', $autosumm ); |
| 1294 | 1295 | if( $this->section == 'new' ) { |
| 1295 | | - $commentsubject="<span id='wpSummaryLabel'><label for='wpSummary'>{$subject}:</label></span>\n<input tabindex='1' type='text' value=\"$summarytext\" name='wpSummary' id='wpSummary' maxlength='200' size='60' />{$summaryhiddens}<br />"; |
| | 1296 | + $commentsubject="<span id='wpSummaryLabel'><label for='wpSummary'>{$subject}</label></span>\n<input tabindex='1' type='text' value=\"$summarytext\" name='wpSummary' id='wpSummary' maxlength='200' size='60' />{$summaryhiddens}<br />"; |
| 1296 | 1297 | $editsummary = "<div class='editOptions'>\n"; |
| 1297 | 1298 | global $wgParser; |
| 1298 | 1299 | $formattedSummary = wfMsgForContent( 'newsectionsummary', $wgParser->stripSectionName( $this->summary ) ); |
| 1299 | | - $subjectpreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">".wfMsg('subject-preview').':'.$sk->commentBlock( $formattedSummary, $this->mTitle, true )."</div>\n" : ''; |
| | 1300 | + $subjectpreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">".wfMsg('subject-preview').$colonSep.$sk->commentBlock( $formattedSummary, $this->mTitle, true )."</div>\n" : ''; |
| 1300 | 1301 | $summarypreview = ''; |
| 1301 | 1302 | } else { |
| 1302 | 1303 | $commentsubject = ''; |
| 1303 | | - $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 />"; |
| 1304 | | - $summarypreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">".wfMsg('summary-preview').':'.$sk->commentBlock( $this->summary, $this->mTitle )."</div>\n" : ''; |
| | 1304 | + $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 />"; |
| | 1305 | + $summarypreview = $summarytext && $this->preview ? "<div class=\"mw-summary-preview\">".wfMsg('summary-preview').$colonSep.$sk->commentBlock( $this->summary, $this->mTitle )."</div>\n" : ''; |
| 1305 | 1306 | $subjectpreview = ''; |
| 1306 | 1307 | } |
| 1307 | 1308 | |