From: Alexandre Emsenhuber <ialex.wiki@gmail.com>
Date: Wed, 4 Apr 2012 20:15:44 +0000 (+0200)
Subject: Use local context to get messages and time formatting methods of Language class
X-Git-Tag: 1.31.0-rc.0~24032^2
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=604c4f5456ced06c455aa3f3eb5c690a517f03b1;p=lhc%2Fweb%2Fwiklou.git

Use local context to get messages and time formatting methods of Language class

Change-Id: Ib3f2bd32bad9e5b84149f6dca6e1cbf56838f601
---

diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php
index 3c31ca0cd6..29aa659eb9 100644
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -165,7 +165,7 @@ class SpecialNewpages extends IncludableSpecialPage {
 		global $wgGroupPermissions;
 
 		// show/hide links
-		$showhide = array( wfMsgHtml( 'show' ), wfMsgHtml( 'hide' ) );
+		$showhide = array( $this->msg( 'show' )->escaped(), $this->msg( 'hide' )->escaped() );
 
 		// Option value -> message mapping
 		$filters = array(
@@ -197,7 +197,7 @@ class SpecialNewpages extends IncludableSpecialPage {
 			$link = Linker::link( $self, $showhide[$onoff], array(),
 					array( $key => $onoff ) + $changed
 			);
-			$links[$key] = wfMsgHtml( $msg, $link );
+			$links[$key] = $this->msg( $msg )->rawParams( $link )->escaped();
 		}
 
 		return $this->getLanguage()->pipeList( $links );
@@ -230,11 +230,11 @@ class SpecialNewpages extends IncludableSpecialPage {
 
 		$form = Xml::openElement( 'form', array( 'action' => $wgScript ) ) .
 			Html::hidden( 'title', $this->getTitle()->getPrefixedDBkey() ) .
-			Xml::fieldset( wfMsg( 'newpages' ) ) .
+			Xml::fieldset( $this->msg( 'newpages' )->text() ) .
 			Xml::openElement( 'table', array( 'id' => 'mw-newpages-table' ) ) .
 			'<tr>
 				<td class="mw-label">' .
-					Xml::label( wfMsg( 'namespace' ), 'namespace' ) .
+					Xml::label( $this->msg( 'namespace' )->text(), 'namespace' ) .
 				'</td>
 				<td class="mw-input">' .
 					Html::namespaceSelector(
@@ -260,7 +260,7 @@ class SpecialNewpages extends IncludableSpecialPage {
 			( $wgEnableNewpagesUserFilter ?
 			'<tr>
 				<td class="mw-label">' .
-					Xml::label( wfMsg( 'newpages-username' ), 'mw-np-username' ) .
+					Xml::label( $this->msg( 'newpages-username' )->text(), 'mw-np-username' ) .
 				'</td>
 				<td class="mw-input">' .
 					Xml::input( 'username', 30, $userText, array( 'id' => 'mw-np-username' ) ) .
@@ -268,7 +268,7 @@ class SpecialNewpages extends IncludableSpecialPage {
 			</tr>' : '' ) .
 			'<tr> <td></td>
 				<td class="mw-submit">' .
-					Xml::submitButton( wfMsg( 'allpagessubmit' ) ) .
+					Xml::submitButton( $this->msg( 'allpagessubmit' )->text() ) .
 				'</td>
 			</tr>' .
 			'<tr>
@@ -308,7 +308,7 @@ class SpecialNewpages extends IncludableSpecialPage {
 
 		$title = Title::newFromRow( $result );
 		$spanTime = Html::element( 'span', array( 'class' => 'mw-newpages-time' ),
-			$lang->timeanddate( $result->rc_timestamp, true )
+			$lang->userTimeAndDate( $result->rc_timestamp, $this->getUser() )
 		);
 		$time = Linker::linkKnown(
 			$title,
@@ -333,11 +333,12 @@ class SpecialNewpages extends IncludableSpecialPage {
 		);
 		$histLink = Linker::linkKnown(
 			$title,
-			wfMsgHtml( 'hist' ),
+			$this->msg( 'hist' )->escaped(),
 			array(),
 			array( 'action' => 'history' )
 		);
-		$hist = Html::rawElement( 'span', array( 'class' => 'mw-newpages-history' ), wfMsg( 'parentheses', $histLink ) );
+		$hist = Html::rawElement( 'span', array( 'class' => 'mw-newpages-history' ),
+			$this->msg( 'parentheses' )->rawParams( $histLink )->escaped() );
 
 		$length = Html::element( 'span', array( 'class' => 'mw-newpages-length' ),
 				'[' . $this->msg( 'nbytes' )->numParams( $result->length )->text() . ']'
@@ -369,7 +370,7 @@ class SpecialNewpages extends IncludableSpecialPage {
 		$oldTitleText = '';
 		$oldTitle = Title::makeTitle( $result->rc_namespace, $result->rc_title );
 		if ( !$title->equals( $oldTitle ) ) {
-			$oldTitleText = wfMessage( 'rc-old-title' )->params( $oldTitle->getPrefixedText() )->escaped();	
+			$oldTitleText = $this->msg( 'rc-old-title' )->params( $oldTitle->getPrefixedText() )->escaped();	
 		}
 
 		return "<li{$css}>{$time} {$dm}{$plink} {$hist} {$dm}{$length} {$dm}{$ulink} {$comment} {$tagDisplay} {$oldTitleText}</li>\n";
@@ -405,7 +406,7 @@ class SpecialNewpages extends IncludableSpecialPage {
 
 		$feed = new $wgFeedClasses[$type](
 			$this->feedTitle(),
-			wfMsgExt( 'tagline', 'parsemag' ),
+			$this->msg( 'tagline' )->text(),
 			$this->getTitle()->getFullUrl()
 		);
 
@@ -454,7 +455,8 @@ class SpecialNewpages extends IncludableSpecialPage {
 	protected function feedItemDesc( $row ) {
 		$revision = Revision::newFromId( $row->rev_id );
 		if( $revision ) {
-			return '<p>' . htmlspecialchars( $revision->getUserText() ) . wfMsgForContent( 'colon-separator' ) .
+			return '<p>' . htmlspecialchars( $revision->getUserText() ) .
+				$this->msg( 'colon-separator' )->inContentLanguage()->escaped() .
 				htmlspecialchars( FeedItem::stripComment( $revision->getComment() ) ) .
 				"</p>\n<hr />\n<div>" .
 				nl2br( htmlspecialchars( $revision->getText() ) ) . "</div>";