r105988 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r105987‎ \| r105988 \| r105989 >
Date:	05:37, 13 December 2011
Author:	jeroendedauw
Status:	ok
Tags:
Comment:	getLang -> getLanguage
Modified paths:	/trunk/extensions/Contest/includes/ContestantPager.php (modified) (history) /trunk/extensions/Contest/specials/SpecialContest.php (modified) (history) /trunk/extensions/Contest/specials/SpecialContestPage.php (modified) (history) /trunk/extensions/Contest/specials/SpecialContestant.php (modified) (history) /trunk/extensions/Contest/specials/SpecialContests.php (modified) (history) /trunk/extensions/Contest/specials/SpecialEditContest.php (modified) (history)

Diff [purge]

Index: trunk/extensions/Contest/specials/SpecialContestPage.php
—	—	@@ -180,7 +180,7 @@
181	181	$subPage = $this->subPage;
182	182	}
183	183
184		~~- $this->getOutput()->addHTML( self::getNavigation( $subPage, $this->getUser(), $this->getLang(), $this->getName() ) );~~
	184	+ $this->getOutput()->addHTML( self::getNavigation( $subPage, $this->getUser(), $this->getLanguage(), $this->getName() ) );
185	185	}
186	186
187	187	}
Index: trunk/extensions/Contest/specials/SpecialContest.php
—	—	@@ -118,13 +118,13 @@
119	119
120	120	$stats['name'] = $contest->getField( 'name' );
121	121	$stats['status'] = Contest::getStatusMessage( $contest->getStatus() );
122		~~- $stats['submissioncount'] = $this->getLang()->formatNum( $contest->getField( 'submission_count' ) );~~
	122	+ $stats['submissioncount'] = $this->getLanguage()->formatNum( $contest->getField( 'submission_count' ) );
123	123
124	124	$stats['end'] = wfMsgExt(
125	125	$contest->getDaysLeft() < 0 ? 'contest-contest-days-ago' : 'contest-contest-days-left',
126	126	'parsemag',
127		~~- $this->getLang()->timeanddate( $contest->getField( 'end' ), true ),~~
128		~~- $this->getLang()->formatNum( abs( $contest->getDaysLeft() ) )~~
	127	+ $this->getLanguage()->timeanddate( $contest->getField( 'end' ), true ),
	128	+ $this->getLanguage()->formatNum( abs( $contest->getDaysLeft() ) )
129	129	);
130	130
131	131	return $stats;
Index: trunk/extensions/Contest/specials/SpecialContestant.php
—	—	@@ -214,11 +214,11 @@
215	215	$stats['rating'] = htmlspecialchars( wfMsgExt(
216	216	'contest-contestant-rating',
217	217	'parsemag',
218		~~- $this->getLang()->formatNum( $contestant->getField( 'rating' ) / 100 ),~~
219		~~- $this->getLang()->formatNum( $contestant->getField( 'rating_count' ) )~~
	218	+ $this->getLanguage()->formatNum( $contestant->getField( 'rating' ) / 100 ),
	219	+ $this->getLanguage()->formatNum( $contestant->getField( 'rating_count' ) )
220	220	) );
221	221
222		~~- $stats['comments'] = htmlspecialchars( $this->getLang()->formatNum( $contestant->getField( 'comments' ) ) );~~
	222	+ $stats['comments'] = htmlspecialchars( $this->getLanguage()->formatNum( $contestant->getField( 'comments' ) ) );
223	223
224	224	return $stats;
225	225	}
—	—	@@ -248,7 +248,7 @@
249	249	$message = wfMsgExt(
250	250	'contest-contestant-voted',
251	251	'parsemag',
252		~~- $this->getLang()->formatNum( $vote->getField( 'value' ) )~~
	252	+ $this->getLanguage()->formatNum( $vote->getField( 'value' ) )
253	253	);
254	254
255	255	$out->addHTML( Html::hidden( 'contestant-vote-id', $vote->getId() ) );
—	—	@@ -276,7 +276,7 @@
277	277	Html::element(
278	278	'label',
279	279	array( 'for' => 'contestant-rating-' . $value ),
280		~~- $this->getLang()->formatNum( $value )~~
	280	+ $this->getLanguage()->formatNum( $value )
281	281	)
282	282	);
283	283	}
—	—	@@ -348,12 +348,12 @@
349	349	'contest-contestant-comment-by',
350	350	Linker::userLink( $comment->getField( 'user_id' ), $user->getName() ) .
351	351	Linker::userToolLinks( $comment->getField( 'user_id' ), $user->getName() )
352		~~- ) . '   ' . htmlspecialchars( $this->getLang()->timeanddate( $comment->getField( 'time' ), true ) )~~
	352	+ ) . '   ' . htmlspecialchars( $this->getLanguage()->timeanddate( $comment->getField( 'time' ), true ) )
353	353	);
354	354
355	355	$html .= Html::rawElement(
356	356	'div',
357		~~- array( 'class' => 'contestant-comment-text mw-content-' . $this->getLang()->getDir() . '' ),~~
	357	+ array( 'class' => 'contestant-comment-text mw-content-' . $this->getLanguage()->getDir() . '' ),
358	358	$this->getOutput()->parse( $comment->getField( 'text' ) )
359	359	);
360	360
Index: trunk/extensions/Contest/specials/SpecialContests.php
—	—	@@ -188,7 +188,7 @@
189	189	$fields[] = Html::element(
190	190	'td',
191	191	array(),
192		~~- $this->getLang()->formatNum( $contest->getField( 'submission_count' ) )~~
	192	+ $this->getLanguage()->formatNum( $contest->getField( 'submission_count' ) )
193	193	);
194	194
195	195	$links = array();
—	—	@@ -247,7 +247,7 @@
248	248	$fields[] = Html::rawElement(
249	249	'td',
250	250	array(),
251		~~- $this->getLang()->pipeList( $links )~~
	251	+ $this->getLanguage()->pipeList( $links )
252	252	);
253	253
254	254	$out->addHTML( '<tr>' . implode( '', $fields ) . '</tr>' );
Index: trunk/extensions/Contest/specials/SpecialEditContest.php
—	—	@@ -124,7 +124,7 @@
125	125	else {
126	126	if ( !$isNew ) {
127	127	$this->getOutput()->addHTML(
128		~~- SpecialContestPage::getNavigation( $contest->getField( 'name' ), $this->getUser(), $this->getLang(), $this->getName() )~~
	128	+ SpecialContestPage::getNavigation( $contest->getField( 'name' ), $this->getUser(), $this->getLanguage(), $this->getName() )
129	129	);
130	130	}
131	131
Index: trunk/extensions/Contest/includes/ContestantPager.php
—	—	@@ -111,8 +111,8 @@
112	112	*
113	113	* @return Language
114	114	*/
115		~~- public function getLang() {~~
116		~~- return version_compare( $GLOBALS['wgVersion'], '1.18', '>' ) ? parent::getLang() : $GLOBALS['wgLang'];~~
	115	+ public function getLanguage() {
	116	+ return version_compare( $GLOBALS['wgVersion'], '1.18', '>' ) ? parent::getLanguage() : $GLOBALS['wgLang'];
117	117	}
118	118
119	119	/**
—	—	@@ -213,14 +213,14 @@
214	214	$value = htmlspecialchars( wfMsg( 'contest-contestant-' . ( $value === '1' ? 'yes' : 'no' ) ) );
215	215	break;
216	216	case 'contestant_comments':
217		~~- $value = htmlspecialchars( $this->getLang()->formatNum( $value ) );~~
	217	+ $value = htmlspecialchars( $this->getLanguage()->formatNum( $value ) );
218	218	break;
219	219	case 'contestant_rating':
220	220	$value = '<div style="white-space:nowrap;">' . htmlspecialchars( wfMsgExt(
221	221	'contest-contestant-rating',
222	222	'parsemag',
223		~~- $this->getLang()->formatNum( $value / 100 ),~~
224		~~- $this->getLang()->formatNum( $this->mCurrentRow->contestant_rating_count )~~
	223	+ $this->getLanguage()->formatNum( $value / 100 ),
	224	+ $this->getLanguage()->formatNum( $this->mCurrentRow->contestant_rating_count )
225	225	) ) . '</div>';
226	226	break;
227	227	case 'contestant_submission':

Status & tagging log

06:23, 13 December 2011 Nikerabbit (talk | contribs) changed the status of r105988 [removed: new added: ok]