| Index: trunk/extensions/ConfirmAccount/SpecialConfirmAccount.php |
| — | — | @@ -121,7 +121,7 @@ |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | function wfConfirmAccountsNotice( $notice ) { |
| 125 | | - global $wgConfirmAccountNotice, $wgUser, $wgMemc; |
| | 125 | + global $wgConfirmAccountNotice, $wgUser, $wgMemc, $wgOut; |
| 126 | 126 | |
| 127 | 127 | if( !$wgConfirmAccountNotice || !$wgUser->isAllowed('confirmaccount') ) |
| 128 | 128 | return true; |
| — | — | @@ -137,8 +137,7 @@ |
| 138 | 138 | |
| 139 | 139 | if( $count ) { |
| 140 | 140 | wfLoadExtensionMessages( 'ConfirmAccount' ); |
| 141 | | - $message = '<div id="mw-confirmaccount-msg" class="mw-confirmaccount-bar">' . |
| 142 | | - wfMsgExt( 'confirmaccount-newrequests', array('parseinline'), $count ) . '</div>'; |
| | 141 | + $message = wfMsgExt( 'confirmaccount-newrequests', array('parsemag'), $count ); |
| 143 | 142 | } else { |
| 144 | 143 | $message = ''; |
| 145 | 144 | } |
| — | — | @@ -146,7 +145,7 @@ |
| 147 | 146 | # Cache results |
| 148 | 147 | $wgMemc->set( $key, $message, 3600*24*7 ); |
| 149 | 148 | |
| 150 | | - $notice .= $message; |
| | 149 | + $notice .= '<div id="mw-confirmaccount-msg" class="mw-confirmaccount-bar">' . $wgOut->parse($message) . '</div>'; |
| 151 | 150 | |
| 152 | 151 | return true; |
| 153 | 152 | } |
| Index: trunk/extensions/ConfirmAccount/ConfirmAccount.i18n.php |
| — | — | @@ -72,7 +72,8 @@ |
| 73 | 73 | 'requestaccount-loginnotice' => 'To obtain a user account, you must \'\'\'[[Special:RequestAccount|request one]]\'\'\'.', |
| 74 | 74 | |
| 75 | 75 | # Site message for admins |
| 76 | | - 'confirmaccount-newrequests' => 'There are currently \'\'\'$1\'\'\' open [[Special:ConfirmAccounts|account requests]] pending.', |
| | 76 | + 'confirmaccount-newrequests' => 'There {{PLURAL:$1|is|are}} currently \'\'\'$1\'\'\' open |
| | 77 | + {{PLURAL:$1|[[Special:ConfirmAccounts|account request]]|[[Special:ConfirmAccounts|account requests]]}} pending.', |
| 77 | 78 | |
| 78 | 79 | # Confirm account page |
| 79 | 80 | 'confirmaccounts' => 'Confirm account requests', |