| Index: trunk/phase3/includes/specials/SpecialRevisiondelete.php |
| — | — | @@ -632,7 +632,7 @@ |
| 633 | 633 | // Make error messages less vague |
| 634 | 634 | $oldBits = $item->getBits(); |
| 635 | 635 | if ( $oldBits == $newBits ) { |
| 636 | | - $status->warning( 'revdelete-no-change', $item->formatDateTime() ); |
| | 636 | + $status->warning( 'revdelete-no-change', $item->formatDate(), $item->formatTime() ); |
| 637 | 637 | $status->failCount++; |
| 638 | 638 | continue; |
| 639 | 639 | } elseif ( $oldBits == 0 && $newBits != 0 ) { |
| — | — | @@ -645,14 +645,14 @@ |
| 646 | 646 | |
| 647 | 647 | if ( $item->isCurrent() && $opType == 'hide' ) { |
| 648 | 648 | // Cannot hide current version text |
| 649 | | - $status->error( 'revdelete-hide-current', $item->formatDateTime() ); |
| | 649 | + $status->error( 'revdelete-hide-current', $item->formatDate(), $item->formatTime() ); |
| 650 | 650 | $status->failCount++; |
| 651 | 651 | continue; |
| 652 | 652 | } |
| 653 | 653 | if ( !$item->canView() ) { |
| 654 | 654 | // Cannot access this revision |
| 655 | 655 | $msg = $opType == 'show' ? 'revdelete-show-no-access' : 'revdelete-modify-no-access'; |
| 656 | | - $status->error( $msg, $item->formatDateTime() ); |
| | 656 | + $status->error( $msg, $item->formatDate(), $item->formatTime() ); |
| 657 | 657 | $status->failCount++; |
| 658 | 658 | continue; |
| 659 | 659 | } |
| — | — | @@ -664,7 +664,7 @@ |
| 665 | 665 | $idsForLog[] = $item->getId(); |
| 666 | 666 | $status->successCount++; |
| 667 | 667 | } else { |
| 668 | | - $status->error( 'revdelete-concurrent-change', $item->formatDateTime() ); |
| | 668 | + $status->error( 'revdelete-concurrent-change', $item->formatDate(), $item->formatTime() ); |
| 669 | 669 | $status->failCount++; |
| 670 | 670 | } |
| 671 | 671 | } |
| — | — | @@ -876,14 +876,22 @@ |
| 877 | 877 | } |
| 878 | 878 | |
| 879 | 879 | /** |
| 880 | | - * Get the timestamp, formatted with $wgLang |
| | 880 | + * Get the date, formatted with $wgLang |
| 881 | 881 | */ |
| 882 | | - public function formatDateTime() { |
| | 882 | + public function formatDate() { |
| 883 | 883 | global $wgLang; |
| 884 | | - return $wgLang->timeanddate( $this->getTimestamp() ); |
| | 884 | + return $wgLang->date( $this->getTimestamp() ); |
| 885 | 885 | } |
| 886 | 886 | |
| 887 | 887 | /** |
| | 888 | + * Get the date, formatted with $wgLang |
| | 889 | + */ |
| | 890 | + public function formatTime() { |
| | 891 | + global $wgLang; |
| | 892 | + return $wgLang->time( $this->getTimestamp() ); |
| | 893 | + } |
| | 894 | + |
| | 895 | + /** |
| 888 | 896 | * Get the timestamp in MW 14-char form |
| 889 | 897 | */ |
| 890 | 898 | public function getTimestamp() { |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1329,15 +1329,15 @@ |
| 1330 | 1330 | 'revdelete-unhid' => 'unhid $1', |
| 1331 | 1331 | 'revdelete-log-message' => '$1 for $2 {{PLURAL:$2|revision|revisions}}', |
| 1332 | 1332 | 'logdelete-log-message' => '$1 for $2 {{PLURAL:$2|event|events}}', |
| 1333 | | -'revdelete-hide-current' => 'Error hiding the item dated $1: this is the current revision. |
| | 1333 | +'revdelete-hide-current' => 'Error hiding the item dated $2, $1: this is the current revision. |
| 1334 | 1334 | It cannot be hidden.', |
| 1335 | | -'revdelete-show-no-access' => 'Error showing the item dated $1: this item has been marked "restricted". |
| | 1335 | +'revdelete-show-no-access' => 'Error showing the item dated $2, $1: this item has been marked "restricted". |
| 1336 | 1336 | You do not have access to it.', |
| 1337 | | -'revdelete-modify-no-access' => 'Error modifying the item dated $1: this item has been marked "restricted". |
| | 1337 | +'revdelete-modify-no-access' => 'Error modifying the item dated $2, $1: this item has been marked "restricted". |
| 1338 | 1338 | You do not have access to it.', |
| 1339 | | -'revdelete-modify-missing' => 'Error modifying item ID $1: it is missing from the database!', |
| 1340 | | -'revdelete-no-change' => "'''Warning:''' the item dated $1 already had the requested visibility settings.", |
| 1341 | | -'revdelete-concurrent-change' => 'Error modifying the item dated $1: its status appears to have been changed by someone else while you attempted to modify it. |
| | 1339 | +'revdelete-modify-missing' => 'Error modifying item ID $2, $1: it is missing from the database!', |
| | 1340 | +'revdelete-no-change' => "'''Warning:''' the item dated $2, $1 already had the requested visibility settings.", |
| | 1341 | +'revdelete-concurrent-change' => 'Error modifying the item dated $2, $1: its status appears to have been changed by someone else while you attempted to modify it. |
| 1342 | 1342 | Please check the logs.', |
| 1343 | 1343 | 'revdelete-only-restricted' => 'You cannot suppress items from view by administrators without also selecting one of the other suppression options.', |
| 1344 | 1344 | |