Message 'revisionasof' - date and time separated as of request by user "Der Umherirre...

http://translatewiki.net/w/i.php?title=Support&oldid=1243738#split_date_and_time

diff --git a/includes/FeedUtils.php b/includes/FeedUtils.php
index 9a2a724..005069b 100644 (file)
--- a/includes/FeedUtils.php
+++ b/includes/FeedUtils.php
@@ -76,7 +76,9 @@ class FeedUtils {
                                wfProfileIn( __FUNCTION__."-dodiff" );
 
                                #$diffText = $de->getDiff( wfMsg( 'revisionasof',
-                               #       $wgContLang->timeanddate( $timestamp ) ),
+                               #       $wgContLang->timeanddate( $timestamp ),
+                               #       $wgContLang->date( $timestamp ),
+                               #       $wgContLang->time( $timestamp ) ),
                                #       wfMsg( 'currentrev' ) );
                                
                                // Don't bother generating the diff if we won't be able to show it
@@ -85,7 +87,9 @@ class FeedUtils {
                                        $diffText = $de->getDiff(
                                                wfMsg( 'previousrevision' ), // hack
                                                wfMsg( 'revisionasof',
-                                                       $wgContLang->timeanddate( $timestamp ) ) );
+                                                       $wgContLang->timeanddate( $timestamp ),
+                                                       $wgContLang->date( $timestamp ),
+                                                       $wgContLang->time( $timestamp ) ) );
                                }
 
                                if ( ( strlen( $diffText ) > $wgFeedDiffCutoff ) || ( $wgFeedDiffCutoff <= 0 ) ) {
@@ -152,4 +156,4 @@ class FeedUtils {
                return $text;
        }
 
-}
\ No newline at end of file
+}

diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index 2df9e14..5e6b9c7 100644 (file)
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -840,6 +840,8 @@ CONTROL;
 
                // Set assorted variables
                $timestamp = $wgLang->timeanddate( $this->mNewRev->getTimestamp(), true );
+               $dateofrev = $wgLang->date( $this->mNewRev->getTimestamp(), true );
+               $timeofrev = $wgLang->time( $this->mNewRev->getTimestamp(), true );
                $this->mNewPage = $this->mNewRev->getTitle();
                if( $this->mNewRev->isCurrent() ) {
                        $newLink = $this->mNewPage->escapeLocalUrl( 'oldid=' . $this->mNewid );
@@ -851,7 +853,7 @@ CONTROL;
                } else {
                        $newLink = $this->mNewPage->escapeLocalUrl( 'oldid=' . $this->mNewid );
                        $newEdit = $this->mNewPage->escapeLocalUrl( 'action=edit&oldid=' . $this->mNewid );
-                       $this->mPagetitle = htmlspecialchars( wfMsg( 'revisionasof', $timestamp ) );
+                       $this->mPagetitle = htmlspecialchars( wfMsg( 'revisionasof', $timestamp, $dateofrev, $timeofrev ) );
 
                        $this->mNewtitle = "<a href='$newLink'>{$this->mPagetitle}</a>";
                        $this->mNewtitle .= " (<a href='$newEdit'>" . wfMsgHtml( $editable ? 'editold' : 'viewsourceold' ) . "</a>)";
@@ -886,9 +888,11 @@ CONTROL;
                        $this->mOldPage = $this->mOldRev->getTitle();
 
                        $t = $wgLang->timeanddate( $this->mOldRev->getTimestamp(), true );
+                       $dateofrev = $wgLang->date( $this->mOldRev->getTimestamp(), true );
+                       $timeofrev = $wgLang->time( $this->mOldRev->getTimestamp(), true );
                        $oldLink = $this->mOldPage->escapeLocalUrl( 'oldid=' . $this->mOldid );
                        $oldEdit = $this->mOldPage->escapeLocalUrl( 'action=edit&oldid=' . $this->mOldid );
-                       $this->mOldPagetitle = htmlspecialchars( wfMsg( 'revisionasof', $t ) );
+                       $this->mOldPagetitle = htmlspecialchars( wfMsg( 'revisionasof', $t, $dateofrev, $timeofrev ) );
 
                        $this->mOldtitle = "<a href='$oldLink'>{$this->mOldPagetitle}</a>"
                        . " (<a href='$oldEdit'>" . wfMsgHtml( $editable ? 'editold' : 'viewsourceold' ) . "</a>)";

diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index 074a4bd..b0e47cb 100644 (file)
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -869,7 +869,9 @@ class UndeleteForm {
                                        $targetPage,
                                        wfMsgHtml(
                                                'revisionasof',
-                                               htmlspecialchars( $wgLang->timeanddate( $rev->getTimestamp(), true ) )
+                                               htmlspecialchars( $wgLang->timeanddate( $rev->getTimestamp(), true ),
+                                               htmlspecialchars( $wgLang->date( $rev->getTimestamp(), true ),
+                                               htmlspecialchars( $wgLang->time( $rev->getTimestamp(), true ) )
                                        ),
                                        array(),
                                        $targetQuery

diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index 9a9be2e..5578910 100644 (file)
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -710,7 +710,7 @@ Please report at [[Support]] if you are unable to properly translate this messag
 'viewpagelogs'           => 'Link displayed in history of pages',
 'currentrev'             => '{{Identical|Current revision}}',
 '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]',
-'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''\".",
+'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.",
 'revision-info'          => 'Appears just below the page title when an old version of the page is being viewed.
 
 * $1 indicates the time of that revision and