r48169 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r48168‎ | r48169 | r48170 >
Date:17:34, 8 March 2009
Author:siebrand
Status:deferred
Tags:
Comment:
* add GENDER support for 'boardvote intro'
* remove unneeded html from 'boardvote intro' and 'boardvote intro_change'
Modified paths:
  • /trunk/extensions/BoardVote/BoardVote.i18n.php (modified) (history)
  • /trunk/extensions/BoardVote/BoardVote_body.php (modified) (history)

Diff [purge]

Index: trunk/extensions/BoardVote/BoardVote_body.php
@@ -282,7 +282,8 @@
283283 if ( $this->mHasVoted ) {
284284 $intro = wfMsg( 'boardvote_intro_change' );
285285 } else {
286 - $intro = wfMsg( 'boardvote_intro' );
 286+ global $wgUser;
 287+ $intro = wfMsgExt( 'boardvote_intro', array( 'parsemag' ), $wgUser->getName() );
287288 }
288289
289290 $ok = wfMsgHtml( 'boardvote_submit' );
Index: trunk/extensions/BoardVote/BoardVote.i18n.php
@@ -17,28 +17,28 @@
1818 'boardvote_entry' => "* [[Special:BoardVote/vote|Vote]]
1919 * [[Special:BoardVote/list|List votes to date]]
2020 * [[Special:BoardVote/dump|Dump encrypted election record]]",
21 - 'boardvote_intro' => "<p>Welcome to the 2008 election for the Wikimedia Board of Trustees.
 21+ 'boardvote_intro' => "Welcome to the 2008 election for the Wikimedia Board of Trustees.
2222 We are voting for one person to represent the community of users on the various Wikimedia projects.
2323 They will help to determine the future direction that the Wikimedia projects will take, individually and as a group, and represent <em>your</em> interests and concerns to the Board of Trustees.
24 -They will decide on ways to generate income and the allocation of moneys raised.</p>
 24+They will decide on ways to generate income and the allocation of moneys raised.
2525
26 -<p>Please read the candidates' statements and responses to queries carefully before voting.
27 -Each of the candidates is a respected user, who has contributed considerable time and effort to making these projects a welcoming environment committed to the pursuit and free distribution of human knowledge.</p>
 26+Please read the candidates' statements and responses to queries carefully before voting.
 27+Each of the candidates is a respected user, who has contributed considerable time and effort to making these projects a welcoming environment committed to the pursuit and free distribution of human knowledge.
2828
29 -<p>Please rank the candidates according to your preferences by filling in a number beside the box (1 = favourite candidate, 2 = second favourite, ...).
 29+Please rank the candidates according to your preferences by filling in a number beside the box (1 = favourite candidate, 2 = second favourite, ...).
3030 You may give the same preference to more than one candidate and may keep candidates unranked.
31 -It is presumed that you prefer all ranked candidates to all not ranked candidates and that you are indifferent between all not ranked candidates.</p>
 31+It is presumed that you prefer all ranked candidates to all not ranked candidates and that you are indifferent between all not ranked candidates.
3232
33 -<p>The winner of the election will be calculated using the Schulze method. For more information, see the official election pages.</p>
 33+The winner of the election will be calculated using the Schulze method. For more information, see the official election pages.
3434
35 -<p>For more information, see:</p>
36 -<ul><li><a href=\"http://meta.wikimedia.org/wiki/Board_elections/2008\" class=\"external\">Board elections 2008</a></li>
37 -<li><a href=\"http://meta.wikimedia.org/wiki/Board_elections/2008/Candidates\" class=\"external\">Candidates</a></li>
38 -<li><a href=\"http://en.wikipedia.org/wiki/Schulze_method\" class=\"external\">Schulze method</a></li></ul>",
39 - 'boardvote_intro_change' => "<p>You have voted before. However you may change
 35+For more information, see:
 36+* [http://meta.wikimedia.org/wiki/Board_elections/2008 Board elections 2008]
 37+* [http://meta.wikimedia.org/wiki/Board_elections/2008/Candidates Candidates]
 38+* [http://en.wikipedia.org/wiki/Schulze_method Schulze method]", # This message supports {{GENDER}}
 39+ 'boardvote_intro_change' => "You have voted before. However you may change
4040 your vote using the form below. Please rank the candidates in your order of preferences, whereby a smaller number
4141 indicate a higher preference for that particular candidate. You may give the same preference to more than one
42 -candidate and may keep candidates unranked.</p>",
 42+candidate and may keep candidates unranked.",
4343 'boardvote_footer' => "&nbsp;", # Do not translate this
4444 'boardvote_entered' => "Thank you, your vote has been recorded.
4545

Status & tagging log