As r24950, but for FileDeleteForm

diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php
index 0805e02..a0b861a 100644 (file)
--- a/includes/FileDeleteForm.php
+++ b/includes/FileDeleteForm.php
@@ -132,8 +132,8 @@ class FileDeleteForm {
                                "{$message}-old",
                                'parse',
                                $this->title->getText(),
-                               $wgLang->date( $this->getTimestamp() ),
-                               $wgLang->time( $this->getTimestamp() ),
+                               $wgLang->date( $this->getTimestamp(), true ),
+                               $wgLang->time( $this->getTimestamp(), true ),
                                $wgServer . $this->file->getArchiveUrl( $this->oldimage )
                        );
                } else {
@@ -196,7 +196,12 @@ class FileDeleteForm {
         * @return string
         */
        private function getTimestamp() {
-               return substr( $this->oldimage, 0, 14 );
+               static $timestamp = false;
+               if( $timestamp === false ) {
+                       $file = RepoGroup::singleton()->getLocalRepo()->newFromArchiveName( $this->title, $this->oldimage );
+                       $timestamp = $file->getTimestamp();
+               }
+               return $timestamp;
        }
        
 }
\ No newline at end of file

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index af420e6..2ff1c13 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1506,13 +1506,13 @@ If you have this image in full resolution upload this one, otherwise change the
 'filedelete' => 'Delete $1',
 'filedelete-legend' => 'Delete file',
 'filedelete-intro' => "You are deleting '''[[Media:$1|$1]]'''.",
-'filedelete-intro-old' => "<span class=\"plainlinks\">You are deleting the version of '''[[Media:$1|$1]]''' as of [$4 $2, $3].</span>",
+'filedelete-intro-old' => "<span class=\"plainlinks\">You are deleting the version of '''[[Media:$1|$1]]''' as of [$4 $3, $2].</span>",
 'filedelete-comment' => 'Comment:',
 'filedelete-submit' => 'Delete',
 'filedelete-success' => "'''$1''' has been deleted.",
-'filedelete-success-old' => "<span class=\"plainlinks\">The version of '''[[Media:$1|$1]]''' as of $2, $3 has been deleted.</span>",
+'filedelete-success-old' => "<span class=\"plainlinks\">The version of '''[[Media:$1|$1]]''' as of $3, $2 has been deleted.</span>",
 'filedelete-nofile' => "'''$1''' does not exist on this site.",
-'filedelete-nofile-old' => "There is no version of '''$1''' dated $2, $3.",
+'filedelete-nofile-old' => "There is no version of '''$1''' dated $3, $2.",
 'filedelete-iscurrent' => 'You are attempting to delete the most recent version of this file. Please revert to an older version first.',
 
 # MIME search