| Index: trunk/phase3/includes/FileRevertForm.php |
| — | — | @@ -68,7 +68,8 @@ |
| 69 | 69 | $status = $this->file->upload( $source, $comment, $comment ); |
| 70 | 70 | if( $status->isGood() ) { |
| 71 | 71 | $wgOut->addHtml( wfMsgExt( 'filerevert-success', 'parse', $this->title->getText(), |
| 72 | | - $wgLang->timeAndDate( $this->getTimestamp() ), |
| | 72 | + $wgLang->date( $this->getTimestamp() ), |
| | 73 | + $wgLang->time( $this->getTimestamp() ), |
| 73 | 74 | $wgServer . $this->file->getArchiveUrl( $this->oldimage ) ) ); |
| 74 | 75 | $wgOut->returnToMain( false, $this->title ); |
| 75 | 76 | } else { |
| — | — | @@ -97,7 +98,7 @@ |
| 98 | 99 | $form .= Xml::hidden( 'wpEditToken', $wgUser->editToken( $this->oldimage ) ); |
| 99 | 100 | $form .= '<fieldset><legend>' . wfMsgHtml( 'filerevert-legend' ) . '</legend>'; |
| 100 | 101 | $form .= wfMsgExt( 'filerevert-intro', 'parse', $this->title->getText(), |
| 101 | | - $wgLang->timeAndDate( $timestamp ), $wgServer . $this->file->getArchiveUrl( $this->oldimage ) ); |
| | 102 | + $wgLang->date( $timestamp ), $wgLang->time( $timestamp ), $wgServer . $this->file->getArchiveUrl( $this->oldimage ) ); |
| 102 | 103 | |
| 103 | 104 | /* |
| 104 | 105 | * I was going to do a little comparison (current vs. old) here, |
| — | — | @@ -119,7 +120,7 @@ |
| 120 | 121 | |
| 121 | 122 | $form .= '<p>' . Xml::inputLabel( wfMsg( 'filerevert-comment' ), 'wpComment', 'wpComment', |
| 122 | 123 | 60, wfMsgForContent( 'filerevert-defaultcomment', |
| 123 | | - $wgContLang->timeAndDate( $timestamp, false, false ) ) ) . '</p>'; |
| | 124 | + $wgContLang->date( $timestamp, false, false ), $wgContLang->time( $timestamp, false, false ) ) ) . '</p>'; |
| 124 | 125 | $form .= '<p>' . Xml::submitButton( wfMsg( 'filerevert-submit' ) ) . '</p>'; |
| 125 | 126 | $form .= '</fieldset>'; |
| 126 | 127 | $form .= '</form>'; |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1439,17 +1439,17 @@ |
| 1440 | 1440 | 'imgdelete' => 'del', |
| 1441 | 1441 | 'imgdesc' => 'desc', |
| 1442 | 1442 | 'imgfile' => 'file', |
| 1443 | | -'filehist' => 'File history', |
| 1444 | | -'filehist-help' => 'Click on a date/time to view the file as it appeared at that time.', |
| 1445 | | -'filehist-deleteall' => 'delete all', |
| 1446 | | -'filehist-deleteone' => 'delete this', |
| 1447 | | -'filehist-revert' => 'revert', |
| 1448 | | -'filehist-current' => 'current', |
| 1449 | | -'filehist-datetime' => 'Date/Time', |
| 1450 | | -'filehist-user' => 'User', |
| 1451 | | -'filehist-dimensions' => 'Dimensions', |
| 1452 | | -'filehist-filesize' => 'File size', |
| 1453 | | -'filehist-comment' => 'Comment', |
| | 1443 | +'filehist' => 'File history', |
| | 1444 | +'filehist-help' => 'Click on a date/time to view the file as it appeared at that time.', |
| | 1445 | +'filehist-deleteall' => 'delete all', |
| | 1446 | +'filehist-deleteone' => 'delete this', |
| | 1447 | +'filehist-revert' => 'revert', |
| | 1448 | +'filehist-current' => 'current', |
| | 1449 | +'filehist-datetime' => 'Date/Time', |
| | 1450 | +'filehist-user' => 'User', |
| | 1451 | +'filehist-dimensions' => 'Dimensions', |
| | 1452 | +'filehist-filesize' => 'File size', |
| | 1453 | +'filehist-comment' => 'Comment', |
| 1454 | 1454 | 'imagelinks' => 'Links', |
| 1455 | 1455 | 'linkstoimage' => 'The following pages link to this file:', |
| 1456 | 1456 | 'nolinkstoimage' => 'There are no pages that link to this file.', |
| — | — | @@ -1468,14 +1468,14 @@ |
| 1469 | 1469 | 'imagelist_search_for' => 'Search for image name:', |
| 1470 | 1470 | |
| 1471 | 1471 | # File reversion |
| 1472 | | -'filerevert' => 'Revert $1', |
| 1473 | | -'filerevert-legend' => 'Revert file', |
| 1474 | | -'filerevert-intro' => "<span class=\"plainlinks\">You are reverting '''[[Media:$1|$1]]''' to the [$3 version as of $2].</span>", |
| 1475 | | -'filerevert-comment' => 'Comment:', |
| 1476 | | -'filerevert-defaultcomment' => 'Reverted to version as of $1', |
| 1477 | | -'filerevert-submit' => 'Revert', |
| 1478 | | -'filerevert-success' => "<span class=\"plainlinks\">'''[[Media:$1|$1]]''' has been reverted to the [$3 version as of $2].</span>", |
| 1479 | | -'filerevert-badversion' => 'There is no previous local version of this file with the provided timestamp.', |
| | 1472 | +'filerevert' => 'Revert $1', |
| | 1473 | +'filerevert-legend' => 'Revert file', |
| | 1474 | +'filerevert-intro' => "<span class=\"plainlinks\">You are reverting '''[[Media:$1|$1]]''' to the [$4 version as of $2, $3].</span>", |
| | 1475 | +'filerevert-comment' => 'Comment:', |
| | 1476 | +'filerevert-defaultcomment' => 'Reverted to version as of $1, $2', |
| | 1477 | +'filerevert-submit' => 'Revert', |
| | 1478 | +'filerevert-success' => "<span class=\"plainlinks\">'''[[Media:$1|$1]]''' has been reverted to the [$4 version as of $2, $3].</span>", |
| | 1479 | +'filerevert-badversion' => 'There is no previous local version of this file with the provided timestamp.', |
| 1480 | 1480 | |
| 1481 | 1481 | # MIME search |
| 1482 | 1482 | 'mimesearch' => 'MIME search', |
| Index: trunk/phase3/languages/messages/MessagesDe.php |
| — | — | @@ -1117,11 +1117,11 @@ |
| 1118 | 1118 | # File reversion |
| 1119 | 1119 | 'filerevert' => 'Zurücksetzen von $1', |
| 1120 | 1120 | 'filerevert-legend' => 'Datei zurücksetzen', |
| 1121 | | -'filerevert-intro' => '<span class="plainlinks">Du setzt die Datei \'\'\'[[Media:$1|$1]]\'\'\' auf die [$3 frühere Version zum Zeitpunkt $2] zurück.</span>', |
| | 1121 | +'filerevert-intro' => '<span class="plainlinks">Du setzt die Datei \'\'\'[[Media:$1|$1]]\'\'\' auf die [$4 Version vom $2, $3 Uhr] zurück.</span>', |
| 1122 | 1122 | 'filerevert-comment' => 'Grund:', |
| 1123 | | -'filerevert-defaultcomment' => 'zurückgesetzt auf Version $1', |
| | 1123 | +'filerevert-defaultcomment' => 'zurückgesetzt auf die Version vom $1, $2 Uhr', |
| 1124 | 1124 | 'filerevert-submit' => 'Zurücksetzen', |
| 1125 | | -'filerevert-success' => '<span class="plainlinks">\'\'\'[[Media:$1|$1]]\'\'\' wurde auf die frühere [$3 Version zum Zeitpunkt $2] zurückgesetzt.</span>', |
| | 1125 | +'filerevert-success' => '<span class="plainlinks">\'\'\'[[Media:$1|$1]]\'\'\' wurde auf die [$4 Version vom $2, $3 Uhr] zurückgesetzt.</span>', |
| 1126 | 1126 | 'filerevert-badversion' => 'Es gibt keine Version der Datei zu dem angegebenen Zeitpunkt.', |
| 1127 | 1127 | |
| 1128 | 1128 | # MIME search |