Replaced some hardcoded colons with the colon-separator message

diff --git a/includes/Article.php b/includes/Article.php
index 706f2b5..5bd3488 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -2124,7 +2124,7 @@ class Article {
 
                if( $reason != 'other' && $this->DeleteReason != '' ) {
                        // Entry from drop down menu + additional comment
-                       $reason .= ': ' . $this->DeleteReason;
+                       $reason .= wfMsgForContent( 'colon-separator' ) . $this->DeleteReason;
                } elseif( $reason == 'other' ) {
                        $reason = $this->DeleteReason;
                }

diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php
index 66086b0..3af9813 100644 (file)
--- a/includes/FileDeleteForm.php
+++ b/includes/FileDeleteForm.php
@@ -67,7 +67,7 @@ class FileDeleteForm {
                        $reason = $this->DeleteReasonList;
                        if ( $reason != 'other' && $this->DeleteReason != '') {
                                // Entry from drop down menu + additional comment
-                               $reason .= ': ' . $this->DeleteReason;
+                               $reason .= wfMsgForContent( 'colon-separator' ) . $this->DeleteReason;
                        } elseif ( $reason == 'other' ) {
                                $reason = $this->DeleteReason;
                        }

diff --git a/includes/LogPage.php b/includes/LogPage.php
index 50a9a23..3f38301 100644 (file)
--- a/includes/LogPage.php
+++ b/includes/LogPage.php
@@ -98,7 +98,7 @@ class LogPage {
                        if ($rcComment == '')
                                $rcComment = $this->comment;
                        else
-                               $rcComment .= ': ' . $this->comment;
+                               $rcComment .= wfMsgForContent( 'colon-separator' ) . $this->comment;
                }
                return $rcComment;
        }

diff --git a/includes/PageHistory.php b/includes/PageHistory.php
index b01b485..27880c6 100644 (file)
--- a/includes/PageHistory.php
+++ b/includes/PageHistory.php
@@ -573,7 +573,7 @@ class PageHistory {
                        $rev->getUserText(),
                        $wgContLang->timeanddate( $rev->getTimestamp() ) );
                } else {
-                       $title = $rev->getUserText() . ": " . FeedItem::stripComment( $rev->getComment() );
+                       $title = $rev->getUserText() . wfMsgForContent( 'colon-separator' ) . FeedItem::stripComment( $rev->getComment() );
                }
 
                return new FeedItem(

diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index 372edfc..d01d3bc 100644 (file)
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -235,7 +235,7 @@ class ProtectionForm {
                $reasonstr = $this->mReasonSelection;
                if ( $reasonstr != 'other' && $this->mReason != '' ) {
                        // Entry from drop down menu + additional comment
-                       $reasonstr .= ': ' . $this->mReason;
+                       $reasonstr .= wfMsgForContent( 'colon-separator' ) . $this->mReason;
                } elseif ( $reasonstr == 'other' ) {
                        $reasonstr = $this->mReason;
                }

diff --git a/includes/Skin.php b/includes/Skin.php
index 348f420..fd3e85f 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1633,7 +1633,7 @@ END;
                        return '';
                }
 
-               $s = wfMsg( 'otherlanguages' ) . ': ';
+               $s = wfMsg( 'otherlanguages' ) . wfMsg( 'colon-separator' );
                $first = true;
                if($wgContLang->isRTL()) $s .= '<span dir="LTR">';
                foreach( $a as $l ) {

diff --git a/includes/Title.php b/includes/Title.php
index 515a3b6..7d470ed 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -2559,8 +2559,8 @@ class Title {
                        );
                        # Update the protection log
                        $log = new LogPage( 'protect' );
-                       $comment = wfMsgForContent('prot_1movedto2',$this->getPrefixedText(), $nt->getPrefixedText() );
-                       if( $reason ) $comment .= ': ' . $reason;
+                       $comment = wfMsgForContent( 'prot_1movedto2', $this->getPrefixedText(), $nt->getPrefixedText() );
+                       if( $reason ) $comment .= wfMsgForContent( 'colon-separator' ) . $reason;
                        $log->addEntry( 'move_prot', $nt, $comment, array($this->getPrefixedText()) ); // FIXME: $params?
                }
 

diff --git a/includes/specials/SpecialBlockip.php b/includes/specials/SpecialBlockip.php
index 4d82997..c7e7c54 100644 (file)
--- a/includes/specials/SpecialBlockip.php
+++ b/includes/specials/SpecialBlockip.php
@@ -363,7 +363,7 @@ class IPBlockForm {
                $reasonstr = $this->BlockReasonList;
                if ( $reasonstr != 'other' && $this->BlockReason != '' ) {
                        // Entry from drop down menu + additional comment
-                       $reasonstr .= ': ' . $this->BlockReason;
+                       $reasonstr .= wfMsgForContent( 'colon-separator' ) . $this->BlockReason;
                } elseif ( $reasonstr == 'other' ) {
                        $reasonstr = $this->BlockReason;
                }

diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index 3d8c18d..2d2cd3c 100644 (file)
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -353,7 +353,7 @@ class SpecialContributions extends SpecialPage {
 
        protected function feedItemDesc( $revision ) {
                if( $revision ) {
-                       return '<p>' . htmlspecialchars( $revision->getUserText() ) . ': ' .
+                       return '<p>' . htmlspecialchars( $revision->getUserText() ) . wfMsgForContent( 'colon-separator' ) .
                                htmlspecialchars( FeedItem::stripComment( $revision->getComment() ) ) . 
                                "</p>\n<hr />\n<div>" .
                                nl2br( htmlspecialchars( $revision->getText() ) ) . "</div>";

diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index f870406..53bae84 100644 (file)
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -142,7 +142,7 @@ class MergehistoryForm {
        }
 
        private function showHistory() {
-               global $wgLang, $wgContLang, $wgUser, $wgOut;
+               global $wgLang, $wgUser, $wgOut;
 
                $this->sk = $wgUser->getSkin();
 
@@ -163,27 +163,26 @@ class MergehistoryForm {
                if( $haveRevisions ) {
                        # Format the user-visible controls (comment field, submission button)
                        # in a nice little table
-                       $align = $wgContLang->isRtl() ? 'left' : 'right';
                        $table =
                                Xml::openElement( 'fieldset' ) .
-                               Xml::openElement( 'table' ) .
+                               Xml::openElement( 'table', array( 'id' => 'mw-mergehistory-table' ) ) .
                                        "<tr>
-                                               <td colspan='2'>" .
+                                               <td class='mw-label'>" .
                                                        wfMsgExt( 'mergehistory-merge', array('parseinline'),
                                                                $this->mTargetObj->getPrefixedText(), $this->mDestObj->getPrefixedText() ) .
                                                "</td>
                                        </tr>
                                        <tr>
-                                               <td align='$align'>" .
+                                               <td class='mw-label'>" .
                                                        Xml::label( wfMsg( 'undeletecomment' ), 'wpComment' ) .
                                                "</td>
-                                               <td>" .
+                                               <td class='mw-input'>" .
                                                        Xml::input( 'wpComment', 50, $this->mComment ) .
                                                "</td>
                                        </tr>
                                        <tr>
                                                <td>&nbsp;</td>
-                                               <td>" .
+                                               <td class='mw-submit'>" .
                                                        Xml::submitButton( wfMsg( 'mergehistory-submit' ), array( 'name' => 'merge', 'id' => 'mw-merge-submit' ) ) .
                                                "</td>
                                        </tr>" .

diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php
index 08e776d..b45955b 100644 (file)
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -331,7 +331,7 @@ class SpecialNewpages extends SpecialPage {
        protected function feedItemDesc( $row ) {
                $revision = Revision::newFromId( $row->rev_id );
                if( $revision ) {
-                       return '<p>' . htmlspecialchars( $revision->getUserText() ) . ': ' .
+                       return '<p>' . htmlspecialchars( $revision->getUserText() ) . wfMsgForContent( 'colon-separator' ) .
                                htmlspecialchars( FeedItem::stripComment( $revision->getComment() ) ) . 
                                "</p>\n<hr />\n<div>" .
                                nl2br( htmlspecialchars( $revision->getText() ) ) . "</div>";