| Index: trunk/extensions/Translate/check-blacklist.php |
| — | — | @@ -99,6 +99,8 @@ |
| 100 | 100 | 'check' => 'variable', |
| 101 | 101 | 'message' => array( |
| 102 | 102 | 'requestaccount-email-body', // Optional time parameters |
| | 103 | + 'confirmaccount-reject', // Optional time parameters |
| | 104 | + 'confirmaccount-held', // Optional time parameters |
| 103 | 105 | ) |
| 104 | 106 | ), |
| 105 | 107 | array( |
| Index: trunk/extensions/ConfirmAccount/ConfirmAccount_body.php |
| — | — | @@ -214,23 +214,27 @@ |
| 215 | 215 | $wgOut->addWikiText( wfMsg( "confirmaccount-text" ) ); |
| 216 | 216 | |
| 217 | 217 | if( $row->acr_rejected ) { |
| 218 | | - $time = $wgLang->timeanddate( wfTimestamp(TS_MW, $row->acr_rejected), true ); |
| | 218 | + $datim = $wgLang->timeanddate( wfTimestamp(TS_MW, $row->acr_rejected), true ); |
| | 219 | + $date = $wgLang->date( wfTimestamp(TS_MW, $row->acr_rejected), true ); |
| | 220 | + $time = $wgLang->time( wfTimestamp(TS_MW, $row->acr_rejected), true ); |
| 219 | 221 | $reason = $row->acr_comment ? $row->acr_comment : wfMsgHtml('confirmaccount-noreason'); |
| 220 | 222 | # Auto-rejected requests have a user ID of zero |
| 221 | 223 | if( $row->acr_user ) { |
| 222 | 224 | $wgOut->addHTML('<p><b>'.wfMsgExt( 'confirmaccount-reject', array('parseinline'), |
| 223 | | - User::whoIs($row->acr_user), $time ).'</b></p>'); |
| | 225 | + User::whoIs($row->acr_user), $datim, $date, $time ).'</b></p>'); |
| 224 | 226 | $wgOut->addHTML( '<p><strong>' . wfMsgHtml('confirmaccount-rational') . '</strong><i> ' . |
| 225 | 227 | $reason . '</i></p>' ); |
| 226 | 228 | } else { |
| 227 | 229 | $wgOut->addHTML( '<p><i> ' . $reason . '</i></p>' ); |
| 228 | 230 | } |
| 229 | 231 | } else if( $row->acr_held ) { |
| 230 | | - $time = $wgLang->timeanddate( wfTimestamp(TS_MW, $row->acr_held), true ); |
| | 232 | + $datim = $wgLang->timeanddate( wfTimestamp(TS_MW, $row->acr_held), true ); |
| | 233 | + $date = $wgLang->date( wfTimestamp(TS_MW, $row->acr_held), true ); |
| | 234 | + $time = $wgLang->time( wfTimestamp(TS_MW, $row->acr_held), true ); |
| 231 | 235 | $reason = $row->acr_comment ? $row->acr_comment : wfMsgHtml('confirmaccount-noreason'); |
| 232 | 236 | |
| 233 | 237 | $wgOut->addHTML('<p><b>'.wfMsgExt( 'confirmaccount-held', array('parseinline'), |
| 234 | | - User::whoIs($row->acr_user), $time ).'</b></p>'); |
| | 238 | + User::whoIs($row->acr_user), $datim, $date, $time ).'</b></p>'); |
| 235 | 239 | $wgOut->addHTML( '<p><strong>' . wfMsgHtml('confirmaccount-rational') . '</strong><i> ' . |
| 236 | 240 | $reason . '</i></p>' ); |
| 237 | 241 | } |
| — | — | @@ -876,11 +880,15 @@ |
| 877 | 881 | $r .= $time." (<strong>{$link}</strong>)"; |
| 878 | 882 | # Auto-rejected accounts have a user ID of zero |
| 879 | 883 | if( $row->acr_rejected && $row->acr_user ) { |
| 880 | | - $time = $wgLang->timeanddate( wfTimestamp(TS_MW, $row->acr_rejected), true ); |
| 881 | | - $r .= ' <b>'.wfMsgExt( 'confirmaccount-reject', array('parseinline'), $row->user_name, $time ).'</b>'; |
| | 884 | + $datim = $wgLang->timeanddate( wfTimestamp(TS_MW, $row->acr_rejected), true ); |
| | 885 | + $date = $wgLang->date( wfTimestamp(TS_MW, $row->acr_rejected), true ); |
| | 886 | + $time = $wgLang->time( wfTimestamp(TS_MW, $row->acr_rejected), true ); |
| | 887 | + $r .= ' <b>'.wfMsgExt( 'confirmaccount-reject', array('parseinline'), $row->user_name, $datim, $date, $time ).'</b>'; |
| 882 | 888 | } else if( $row->acr_held && !$row->acr_rejected ) { |
| 883 | | - $time = $wgLang->timeanddate( wfTimestamp(TS_MW, $row->acr_held), true ); |
| 884 | | - $r .= ' <b>'.wfMsgExt( 'confirmaccount-held', array('parseinline'), User::whoIs($row->acr_user), $time ).'</b>'; |
| | 889 | + $datim = $wgLang->timeanddate( wfTimestamp(TS_MW, $row->acr_held), true ); |
| | 890 | + $date = $wgLang->date( wfTimestamp(TS_MW, $row->acr_held), true ); |
| | 891 | + $time = $wgLang->time( wfTimestamp(TS_MW, $row->acr_held), true ); |
| | 892 | + $r .= ' <b>'.wfMsgExt( 'confirmaccount-held', array('parseinline'), User::whoIs($row->acr_user), $datim, $date, $time ).'</b>'; |
| 885 | 893 | } |
| 886 | 894 | # Check if someone is viewing this request |
| 887 | 895 | global $wgMemc; |
| Index: trunk/extensions/ConfirmAccount/ConfirmAccount.i18n.php |
| — | — | @@ -289,7 +289,17 @@ |
| 290 | 290 | 'confirmaccount-notes' => '{{Identical|Additional notes}}', |
| 291 | 291 | 'confirmaccount-urls' => '{{Identical|List of websites}}', |
| 292 | 292 | 'confirmaccount-none-p' => '{{Identical/Notprovided}}', |
| | 293 | + 'confirmaccount-reject' => 'Parameters: |
| | 294 | +*$1 user name |
| | 295 | +*$2 date/time |
| | 296 | +*$3 date |
| | 297 | +*$4 time', |
| 293 | 298 | 'confirmaccount-noreason' => '{{Identical|None}}', |
| | 299 | + 'confirmaccount-held' => 'Parameters: |
| | 300 | +*$1 user name |
| | 301 | +*$2 date/time |
| | 302 | +*$3 date |
| | 303 | +*$4 time', |
| 294 | 304 | 'confirmaccount-ip' => '{{Identical|IP Address}}', |
| 295 | 305 | 'confirmaccount-submit' => '{{Identical|Confirm}}', |
| 296 | 306 | 'confirmaccount-welc' => 'In ConfirmAccount extension. A welcome message that is automatically placed on the talk pages of new users.', |