From 4a5ae9a4a9e81b19c6f3fa71137a5f49d263c57f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Mon, 14 Jul 2008 19:10:47 +0000
Subject: [PATCH] * Cleanup for r37375. Split duplicated code into function and
 really fix it

---
 includes/Linker.php                         | 11 +++++++++++
 includes/PageHistory.php                    |  9 +--------
 includes/specials/SpecialMergeHistory.php   |  8 +-------
 includes/specials/SpecialProtectedpages.php |  9 +--------
 includes/specials/SpecialRevisiondelete.php |  4 ++--
 includes/specials/SpecialUndelete.php       |  7 +------
 6 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/includes/Linker.php b/includes/Linker.php
index 7af49ad381..7dfb60d5e6 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1211,6 +1211,17 @@ class Linker {
 		return $block;
 	}
 
+	public function formatRevisionSize( $size ) {
+		if ( $size == 0 ) {
+			$stxt = wfMsgExt( 'historyempty', 'parsemag' );
+		} else {
+			$stxt = wfMsgExt( 'nbytes', 'parsemag', $wgLang->formatNum( $size ) );
+			$stxt = "($stxt)";
+		}
+		$stxt = htmlspecialchars( $stxt );
+		return "<span class=\"history-size\">$stxt</span>";
+	}
+
 	/** @todo document */
 	function tocIndent() {
 		return "\n<ul>";
diff --git a/includes/PageHistory.php b/includes/PageHistory.php
index 08194413f8..6d8a7c2165 100644
--- a/includes/PageHistory.php
+++ b/includes/PageHistory.php
@@ -245,14 +245,7 @@ class PageHistory {
 		}
 
 		if ( !is_null( $size = $rev->getSize() ) && $rev->userCan( Revision::DELETED_TEXT ) ) {
-			if ( $size == 0 ) {
-				$stxt = wfMsg( 'historyempty' );
-			} else {
-				$stxt = wfMsg( 'nbytes', $wgLang->formatNum( $size ) );
-				$stxt = "($stxt)";
-			}
-			$stxt = htmlspecialchars( $stxt );
-			$s .= " <span class=\"history-size\">$stxt</span>";
+			$s .= ' ' . $this->mSkin->formatRevisionSize( $size );
 		}
 
 		$s .= $this->mSkin->revComment( $rev, false, true );
diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index 12b3d1f6f6..0460c20726 100644
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -247,13 +247,7 @@ class MergehistoryForm {
 		$userLink = $this->sk->revUserTools( $rev );
 
 		if(!is_null($size = $row->rev_len)) {
-			if($size == 0) {
-				$stxt = wfMsg('historyempty');
-			} else {
-				$stxt = wfMsg('nbytes', $wgLang->formatNum( $size ) );
-				$stxt = "($stxt)";
-			}
-			$stxt = htmlspecialchars( $stxt );
+			$stxt = $this->sk->formatRevisionSize( $size );
 		}
 		$comment = $this->sk->revComment( $rev );
 
diff --git a/includes/specials/SpecialProtectedpages.php b/includes/specials/SpecialProtectedpages.php
index 6524324b74..3025c0559c 100644
--- a/includes/specials/SpecialProtectedpages.php
+++ b/includes/specials/SpecialProtectedpages.php
@@ -89,14 +89,7 @@ class ProtectedPagesForm {
 		}
 
 		if (!is_null($size = $row->page_len)) {
-			if ($size == 0) {
-				$stxt = wfMsg('historyempty');
-			} else {
-				$stxt = wfMsg('nbytes', $wgLang->formatNum( $size ) );
-				$stxt = "($stxt)";
-			}
-			$stxt = htmlspecialchars( $stxt );
-			$stxt = $wgContLang->getDirMark() . ' ' . $stxt;
+			$stxt = $wgContLang->getDirMark() . ' ' . $skin->formatRevisionSize( $size );
 		}
 
 		# Show a link to the change protection form for allowed users otherwise a link to the protection log
diff --git a/includes/specials/SpecialRevisiondelete.php b/includes/specials/SpecialRevisiondelete.php
index 9d2dcaa423..e94fc222f6 100644
--- a/includes/specials/SpecialRevisiondelete.php
+++ b/includes/specials/SpecialRevisiondelete.php
@@ -595,7 +595,7 @@ class RevisionDeleteForm {
 		$data = wfMsg( 'widthheight',
 					$wgLang->formatNum( $file->getWidth() ),
 					$wgLang->formatNum( $file->getHeight() ) ) .
-			' (' . wfMsg( 'nbytes', $wgLang->formatNum( $file->getSize() ) ) . ')';
+			' (' . wfMsgExt( 'nbytes', 'parsemag', $wgLang->formatNum( $file->getSize() ) ) . ')';
 		$data = htmlspecialchars( $data );
 
 		return "<li>$pageLink ".$this->fileUserTools( $file )." $data ".$this->fileComment( $file )."$del</li>";
@@ -622,7 +622,7 @@ class RevisionDeleteForm {
 		$data = wfMsg( 'widthheight',
 					$wgLang->formatNum( $file->getWidth() ),
 					$wgLang->formatNum( $file->getHeight() ) ) .
-			' (' . wfMsg( 'nbytes', $wgLang->formatNum( $file->getSize() ) ) . ')';
+			' (' . wfMsgExt( 'nbytes', 'parsemag', $wgLang->formatNum( $file->getSize() ) ) . ')';
 		$data = htmlspecialchars( $data );
 
 		return "<li> $pageLink ".$this->fileUserTools( $file )." $data ".$this->fileComment( $file )."$del</li>";
diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index 805f451d7a..fbbf89d687 100644
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -1086,12 +1086,7 @@ class UndeleteForm {
 		$userLink = $sk->revUserTools( $rev );
 
 		if(!is_null($size = $row->ar_len)) {
-			if($size == 0) {
-				$stxt = wfMsg('historyempty');
-			} else {
-				$stxt = '(' . wfMsg('nbytes', $wgLang->formatNum( $size ) ) . ')';
-			}
-			$stxt = htmlspecialchars( $stxt );
+			$stxt = $sk->formatRevisionSize( $size );
 		}
 		$comment = $sk->revComment( $rev );
 		$revdlink = '';
-- 
2.20.1