| Index: trunk/phase3/includes/diff/DifferenceEngine.php |
| — | — | @@ -840,6 +840,8 @@ |
| 841 | 841 | |
| 842 | 842 | // Set assorted variables |
| 843 | 843 | $timestamp = $wgLang->timeanddate( $this->mNewRev->getTimestamp(), true ); |
| | 844 | + $dateofrev = $wgLang->date( $this->mNewRev->getTimestamp(), true ); |
| | 845 | + $timeofrev = $wgLang->time( $this->mNewRev->getTimestamp(), true ); |
| 844 | 846 | $this->mNewPage = $this->mNewRev->getTitle(); |
| 845 | 847 | if( $this->mNewRev->isCurrent() ) { |
| 846 | 848 | $newLink = $this->mNewPage->escapeLocalUrl( 'oldid=' . $this->mNewid ); |
| — | — | @@ -851,7 +853,7 @@ |
| 852 | 854 | } else { |
| 853 | 855 | $newLink = $this->mNewPage->escapeLocalUrl( 'oldid=' . $this->mNewid ); |
| 854 | 856 | $newEdit = $this->mNewPage->escapeLocalUrl( 'action=edit&oldid=' . $this->mNewid ); |
| 855 | | - $this->mPagetitle = htmlspecialchars( wfMsg( 'revisionasof', $timestamp ) ); |
| | 857 | + $this->mPagetitle = htmlspecialchars( wfMsg( 'revisionasof', $timestamp, $dateofrev, $timeofrev ) ); |
| 856 | 858 | |
| 857 | 859 | $this->mNewtitle = "<a href='$newLink'>{$this->mPagetitle}</a>"; |
| 858 | 860 | $this->mNewtitle .= " (<a href='$newEdit'>" . wfMsgHtml( $editable ? 'editold' : 'viewsourceold' ) . "</a>)"; |
| — | — | @@ -886,9 +888,11 @@ |
| 887 | 889 | $this->mOldPage = $this->mOldRev->getTitle(); |
| 888 | 890 | |
| 889 | 891 | $t = $wgLang->timeanddate( $this->mOldRev->getTimestamp(), true ); |
| | 892 | + $dateofrev = $wgLang->date( $this->mOldRev->getTimestamp(), true ); |
| | 893 | + $timeofrev = $wgLang->time( $this->mOldRev->getTimestamp(), true ); |
| 890 | 894 | $oldLink = $this->mOldPage->escapeLocalUrl( 'oldid=' . $this->mOldid ); |
| 891 | 895 | $oldEdit = $this->mOldPage->escapeLocalUrl( 'action=edit&oldid=' . $this->mOldid ); |
| 892 | | - $this->mOldPagetitle = htmlspecialchars( wfMsg( 'revisionasof', $t ) ); |
| | 896 | + $this->mOldPagetitle = htmlspecialchars( wfMsg( 'revisionasof', $t, $dateofrev, $timeofrev ) ); |
| 893 | 897 | |
| 894 | 898 | $this->mOldtitle = "<a href='$oldLink'>{$this->mOldPagetitle}</a>" |
| 895 | 899 | . " (<a href='$oldEdit'>" . wfMsgHtml( $editable ? 'editold' : 'viewsourceold' ) . "</a>)"; |
| Index: trunk/phase3/includes/FeedUtils.php |
| — | — | @@ -76,7 +76,9 @@ |
| 77 | 77 | wfProfileIn( __FUNCTION__."-dodiff" ); |
| 78 | 78 | |
| 79 | 79 | #$diffText = $de->getDiff( wfMsg( 'revisionasof', |
| 80 | | - # $wgContLang->timeanddate( $timestamp ) ), |
| | 80 | + # $wgContLang->timeanddate( $timestamp ), |
| | 81 | + # $wgContLang->date( $timestamp ), |
| | 82 | + # $wgContLang->time( $timestamp ) ), |
| 81 | 83 | # wfMsg( 'currentrev' ) ); |
| 82 | 84 | |
| 83 | 85 | // Don't bother generating the diff if we won't be able to show it |
| — | — | @@ -85,7 +87,9 @@ |
| 86 | 88 | $diffText = $de->getDiff( |
| 87 | 89 | wfMsg( 'previousrevision' ), // hack |
| 88 | 90 | wfMsg( 'revisionasof', |
| 89 | | - $wgContLang->timeanddate( $timestamp ) ) ); |
| | 91 | + $wgContLang->timeanddate( $timestamp ), |
| | 92 | + $wgContLang->date( $timestamp ), |
| | 93 | + $wgContLang->time( $timestamp ) ) ); |
| 90 | 94 | } |
| 91 | 95 | |
| 92 | 96 | if ( ( strlen( $diffText ) > $wgFeedDiffCutoff ) || ( $wgFeedDiffCutoff <= 0 ) ) { |
| — | — | @@ -152,4 +156,4 @@ |
| 153 | 157 | return $text; |
| 154 | 158 | } |
| 155 | 159 | |
| 156 | | -} |
| \ No newline at end of file |
| | 160 | +} |
| Index: trunk/phase3/includes/specials/SpecialUndelete.php |
| — | — | @@ -869,7 +869,9 @@ |
| 870 | 870 | $targetPage, |
| 871 | 871 | wfMsgHtml( |
| 872 | 872 | 'revisionasof', |
| 873 | | - htmlspecialchars( $wgLang->timeanddate( $rev->getTimestamp(), true ) ) |
| | 873 | + htmlspecialchars( $wgLang->timeanddate( $rev->getTimestamp(), true ), |
| | 874 | + htmlspecialchars( $wgLang->date( $rev->getTimestamp(), true ), |
| | 875 | + htmlspecialchars( $wgLang->time( $rev->getTimestamp(), true ) ) |
| 874 | 876 | ), |
| 875 | 877 | array(), |
| 876 | 878 | $targetQuery |
| Index: trunk/phase3/languages/messages/MessagesQqq.php |
| — | — | @@ -710,7 +710,7 @@ |
| 711 | 711 | 'viewpagelogs' => 'Link displayed in history of pages', |
| 712 | 712 | 'currentrev' => '{{Identical|Current revision}}', |
| 713 | 713 | 'currentrev-asof' => 'The text appears at the right side when comparing 2 different edits of the same page. For example: [http://translatewiki.net/w/i.php?title=FreeCol%3AIntegerAboveZero%2Fca&diff=788645&oldid=788644]', |
| 714 | | -'revisionasof' => "Used on a difference page when comparing different versions of a page or when viewing an non-current version of a page. \$1 is the date/time at which the revision was created. Example: \"''Revision as of 14:44, 24 January 2008''\".", |
| | 714 | +'revisionasof' => "Used on a difference page when comparing different versions of a page or when viewing an non-current version of a page. \$1 is the date/time at which the revision was created. Example: \"''Revision as of 14:44, 24 January 2008''\". \$2 is the date at which the revision was created. \$3 is the time at which the revision was created.", |
| 715 | 715 | 'revision-info' => 'Appears just below the page title when an old version of the page is being viewed. |
| 716 | 716 | |
| 717 | 717 | * $1 indicates the time of that revision and |