r99384 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r99383‎ | r99384 | r99385 >
Date:23:16, 9 October 2011
Author:aaron
Status:deferred (Comments)
Tags:
Comment:
Partial revert of r99338. 'parsemag' was needed...the PLURAL order was correct before.
Modified paths:
  • /trunk/extensions/ConfirmAccount/ConfirmAccount.php (modified) (history)
  • /trunk/extensions/ConfirmAccount/presentation/ConfirmAccount.i18n.php (modified) (history)
  • /trunk/extensions/ConfirmAccount/presentation/ConfirmAccountUI.hooks.php (modified) (history)

Diff [purge]

Index: trunk/extensions/ConfirmAccount/ConfirmAccount.php
@@ -82,7 +82,7 @@
8383 # JS/CSS modules and message bundles used by JS scripts
8484 ConfirmAccountUISetup::defineResourceModules( $wgResourceModules );
8585
86 -# ####### EVENT-HANDLER FUNCTIONS #########
 86+# ####### HOOK CALLBACK FUNCTIONS #########
8787
8888 # UI-related hook handlers
8989 ConfirmAccountUISetup::defineHookHandlers( $wgHooks );
@@ -93,4 +93,4 @@
9494 # Schema changes
9595 $wgHooks['LoadExtensionSchemaUpdates'][] = 'ConfirmAccountUpdaterHooks::addSchemaUpdates';
9696
97 -# ####### END HOOK TRIGGERED FUNCTIONS #########
 97+# ####### END HOOK CALLBACK FUNCTIONS #########
Index: trunk/extensions/ConfirmAccount/presentation/ConfirmAccountUI.hooks.php
@@ -66,9 +66,9 @@
6767 }
6868 $count = ConfirmAccount::getOpenEmailConfirmedCount( '*' );
6969 if ( $count > 0 ) {
70 - $out->prependHtml(
 70+ $out->prependHtml( // parsemag for PLURAL
7171 '<div id="mw-confirmaccount-msg" class="plainlinks mw-confirmaccount-bar">' .
72 - $out->parse( wfMsg( 'confirmaccount-newrequests', $count ), false ) .
 72+ $out->parse( wfMsgExt( 'confirmaccount-newrequests', 'parsemag', $count ), false ) .
7373 '</div>'
7474 );
7575
Index: trunk/extensions/ConfirmAccount/presentation/ConfirmAccount.i18n.php
@@ -80,7 +80,7 @@
8181 'requestaccount-loginnotice' => 'To obtain a user account, you must \'\'\'[[Special:RequestAccount|request one]]\'\'\'.',
8282
8383 # Site message for admins
84 - 'confirmaccount-newrequests' => '\'\'\'$1\'\'\' open e-mail confirmed [[Special:ConfirmAccounts|account {{PLURAL:$1|requests are pending|request is pending}}]]. \'\'\'Your attention is needed!\'\'\'',
 84+ 'confirmaccount-newrequests' => '\'\'\'$1\'\'\' open e-mail confirmed [[Special:ConfirmAccounts|account {{PLURAL:$1|request is pending|requests are pending}}]]. \'\'\'Your attention is needed!\'\'\'',
8585
8686 # Confirm account page
8787 'confirmaccounts' => 'Confirm account requests',

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r99338Fixed backwards PLURAL usage and improved text in confirmaccount-newrequests ...aaron06:17, 9 October 2011

Comments

#Comment by Nikerabbit (talk | contribs)   16:43, 11 October 2011

the $count param should also be run through formatNum() (even if it is not displayed by default).

Status & tagging log