Separate date and time in new 'filerevert-intro', 'filerevert-defaultcomment' and...

It's always a mess to localize with timestamps, at least in German :-(

diff --git a/includes/FileRevertForm.php b/includes/FileRevertForm.php
index 6afa419..d72654b 100644 (file)
--- a/includes/FileRevertForm.php
+++ b/includes/FileRevertForm.php
@@ -68,7 +68,8 @@ class FileRevertForm {
                        $status = $this->file->upload( $source, $comment, $comment );
                        if( $status->isGood() ) {
                                $wgOut->addHtml( wfMsgExt( 'filerevert-success', 'parse', $this->title->getText(),
-                                       $wgLang->timeAndDate( $this->getTimestamp() ),
+                                       $wgLang->date( $this->getTimestamp() ),
+                                       $wgLang->time( $this->getTimestamp() ),
                                        $wgServer . $this->file->getArchiveUrl( $this->oldimage ) ) );
                                $wgOut->returnToMain( false, $this->title );
                        } else {
@@ -97,7 +98,7 @@ class FileRevertForm {
                $form .= Xml::hidden( 'wpEditToken', $wgUser->editToken( $this->oldimage ) );
                $form .= '<fieldset><legend>' . wfMsgHtml( 'filerevert-legend' ) . '</legend>';
                $form .= wfMsgExt( 'filerevert-intro', 'parse', $this->title->getText(),
-                       $wgLang->timeAndDate( $timestamp ), $wgServer . $this->file->getArchiveUrl( $this->oldimage ) );
+                       $wgLang->date( $timestamp ), $wgLang->time( $timestamp ), $wgServer . $this->file->getArchiveUrl( $this->oldimage ) );
                
                /*
                 * I was going to do a little comparison (current vs. old) here,
@@ -119,7 +120,7 @@ class FileRevertForm {
                
                $form .= '<p>' . Xml::inputLabel( wfMsg( 'filerevert-comment' ), 'wpComment', 'wpComment',
                        60, wfMsgForContent( 'filerevert-defaultcomment',
-                       $wgContLang->timeAndDate( $timestamp, false, false ) ) ) . '</p>';
+                       $wgContLang->date( $timestamp, false, false ), $wgContLang->time( $timestamp, false, false ) ) ) . '</p>';
                $form .= '<p>' . Xml::submitButton( wfMsg( 'filerevert-submit' ) ) . '</p>';
                $form .= '</fieldset>';
                $form .= '</form>';

diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index 589cf74..4e54f49 100644 (file)
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -1117,11 +1117,11 @@ Bitte prüfen Sie, ob Sie das Bild in voller Auflösung vorliegen haben und lade
 # File reversion
 'filerevert'                => 'Zurücksetzen von $1',
 'filerevert-legend'         => 'Datei zurücksetzen',
-'filerevert-intro'          => '<span class="plainlinks">Du setzt die Datei \'\'\'[[Media:$1|$1]]\'\'\' auf die [$3 frühere Version zum Zeitpunkt $2] zurück.</span>',
+'filerevert-intro'          => '<span class="plainlinks">Du setzt die Datei \'\'\'[[Media:$1|$1]]\'\'\' auf die [$4 Version vom $2, $3 Uhr] zurück.</span>',
 'filerevert-comment'        => 'Grund:',
-'filerevert-defaultcomment' => 'zurückgesetzt auf Version $1',
+'filerevert-defaultcomment' => 'zurückgesetzt auf die Version vom $1, $2 Uhr',
 'filerevert-submit'         => 'Zurücksetzen',
-'filerevert-success'        => '<span class="plainlinks">\'\'\'[[Media:$1|$1]]\'\'\' wurde auf die frühere [$3 Version zum Zeitpunkt $2] zurückgesetzt.</span>',
+'filerevert-success'        => '<span class="plainlinks">\'\'\'[[Media:$1|$1]]\'\'\' wurde auf die [$4 Version vom $2, $3 Uhr] zurückgesetzt.</span>',
 'filerevert-badversion'     => 'Es gibt keine Version der Datei zu dem angegebenen Zeitpunkt.',
 
 # MIME search

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 940168d..caf0c8a 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1439,17 +1439,17 @@ If you have this image in full resolution upload this one, otherwise change the
 'imgdelete'                 => 'del',
 'imgdesc'                   => 'desc',
 'imgfile'                   => 'file',
-'filehist' => 'File history',
-'filehist-help' => 'Click on a date/time to view the file as it appeared at that time.',
-'filehist-deleteall' => 'delete all',
-'filehist-deleteone' => 'delete this',
-'filehist-revert' => 'revert',
-'filehist-current' => 'current',
-'filehist-datetime' => 'Date/Time',
-'filehist-user' => 'User',
-'filehist-dimensions' => 'Dimensions',
-'filehist-filesize' => 'File size',
-'filehist-comment' => 'Comment',
+'filehist'                  => 'File history',
+'filehist-help'             => 'Click on a date/time to view the file as it appeared at that time.',
+'filehist-deleteall'        => 'delete all',
+'filehist-deleteone'        => 'delete this',
+'filehist-revert'           => 'revert',
+'filehist-current'          => 'current',
+'filehist-datetime'         => 'Date/Time',
+'filehist-user'             => 'User',
+'filehist-dimensions'       => 'Dimensions',
+'filehist-filesize'         => 'File size',
+'filehist-comment'          => 'Comment',
 'imagelinks'                => 'Links',
 'linkstoimage'              => 'The following pages link to this file:',
 'nolinkstoimage'            => 'There are no pages that link to this file.',
@@ -1468,14 +1468,14 @@ If you have this image in full resolution upload this one, otherwise change the
 'imagelist_search_for'      => 'Search for image name:',
 
 # File reversion
-'filerevert' => 'Revert $1',
-'filerevert-legend' => 'Revert file',
-'filerevert-intro' => "<span class=\"plainlinks\">You are reverting '''[[Media:$1|$1]]''' to the [$3 version as of $2].</span>",
-'filerevert-comment' => 'Comment:',
-'filerevert-defaultcomment' => 'Reverted to version as of $1',
-'filerevert-submit' => 'Revert',
-'filerevert-success' => "<span class=\"plainlinks\">'''[[Media:$1|$1]]''' has been reverted to the [$3 version as of $2].</span>",
-'filerevert-badversion' => 'There is no previous local version of this file with the provided timestamp.',
+'filerevert'                => 'Revert $1',
+'filerevert-legend'         => 'Revert file',
+'filerevert-intro'          => "<span class=\"plainlinks\">You are reverting '''[[Media:$1|$1]]''' to the [$4 version as of $2, $3].</span>",
+'filerevert-comment'        => 'Comment:',
+'filerevert-defaultcomment' => 'Reverted to version as of $1, $2',
+'filerevert-submit'         => 'Revert',
+'filerevert-success'        => "<span class=\"plainlinks\">'''[[Media:$1|$1]]''' has been reverted to the [$4 version as of $2, $3].</span>",
+'filerevert-badversion'     => 'There is no previous local version of this file with the provided timestamp.',
 
 # MIME search
 'mimesearch'         => 'MIME search',