- $wgOut->addHTML( "<li>{$line}" );
-
- if ( !$block->mAuto ) {
- $titleObj = Title::makeTitle( NS_SPECIAL, "Contributions" );
- $clink = "<a href=\"" . $titleObj->escapeLocalURL( "target={$block->mAddress}" ) . "\">" .
- wfMsg( "contribslink" ) . "</a>";
- $wgOut->addHTML( " ({$clink})" );
- }
-
- if ( $wgUser->isAllowed('block') ) {
- $titleObj = Title::makeTitle( NS_SPECIAL, "Ipblocklist" );
- $ublink = "<a href=\"" .
- $titleObj->escapeLocalURL( "action=unblock&ip=" . urlencode( $addr ) ) . "\">" .
- wfMsg( "unblocklink" ) . "</a>";
- $wgOut->addHTML( " ({$ublink})" );
- }
- if ( "" != $block->mReason ) {
- $wgOut->addHTML( " <em>(" . $sk->formatComment( $block->mReason ) .
- ")</em>" );
+ $name = $block->getByName();
+ $ulink = $sk->makeKnownLinkObj( Title::makeTitle( NS_USER, $name ), $name );
+ $formattedTime = $wgLang->timeanddate( $block->mTimestamp, true );
+
+ if ( $block->mExpiry === "" ) {
+ $formattedExpiry = $msg['infiniteblock'];
+ } else {
+ $formattedExpiry = wfMsgReplaceArgs( $msg['expiringblock'],
+ array( $wgLang->timeanddate( $block->mExpiry, true ) ) );
+ }
+
+ $line = wfMsgReplaceArgs( $msg['blocklistline'], array( $formattedTime, $ulink, $addr, $formattedExpiry ) );
+
+ $wgOut->addHTML( "<li>{$line}" );
+
+ if ( !$block->mAuto ) {
+ $titleObj = Title::makeTitle( NS_SPECIAL, "Contributions" );
+ $wgOut->addHTML( ' (' . $sk->makeKnownLinkObj($titleObj, $msg['contribslink'], "target={$block->mAddress}") . ')' );
+ }
+
+ if ( $wgUser->isAllowed('block') ) {
+ $titleObj = Title::makeTitle( NS_SPECIAL, "Ipblocklist" );
+ $wgOut->addHTML( ' (' . $sk->makeKnownLinkObj($titleObj, $msg['unblocklink'], 'action=unblock&ip=' . urlencode( $addr ) ) . ')' );
+ }
+ $wgOut->addHTML( $sk->commentBlock( $block->mReason ) );
+ $wgOut->addHTML( "</li>\n" );
+ wfProfileOut( $fname );