| Index: trunk/phase3/includes/UserMailer.php |
| — | — | @@ -582,8 +582,13 @@ |
| 583 | 583 | # $PAGEEDITDATE is the time and date of the page change |
| 584 | 584 | # expressed in terms of individual local time of the notification |
| 585 | 585 | # recipient, i.e. watching user |
| 586 | | - $body = str_replace('$PAGEEDITDATE', |
| 587 | | - $wgContLang->timeanddate( $this->timestamp, true, false, $timecorrection ), |
| | 586 | + $body = str_replace( |
| | 587 | + array( '$PAGEEDITDATEANDTIME', |
| | 588 | + '$PAGEEDITDATE', |
| | 589 | + '$PAGEEDITTIME' ), |
| | 590 | + array( $wgContLang->timeanddate( $this->timestamp, true, false, $timecorrection ), |
| | 591 | + $wgContLang->date( $this->timestamp, true, false, $timecorrection ), |
| | 592 | + $wgContLang->time( $this->timestamp, true, false, $timecorrection ) ), |
| 588 | 593 | $body); |
| 589 | 594 | |
| 590 | 595 | return UserMailer::send($to, $this->from, $this->subject, $body, $this->replyto); |
| Index: trunk/phase3/languages/messages/MessagesQqq.php |
| — | — | @@ -1976,8 +1976,13 @@ |
| 1977 | 1977 | 'deleted' => '{{Identical|Deleted}}', |
| 1978 | 1978 | 'enotif_subject' => '$CHANGEDORCREATED can be one of {{msg|changed}} and {{msg|created}}.', |
| 1979 | 1979 | 'enotif_rev_info' => 'Substituted as $REVINFO in {{msg-mw|enotif body|notext=1}}', |
| 1980 | | -'enotif_body' => '$CHANGEDORCREATED can be one of {{msg-mw|changed}} and {{msg-mw|created}}.', |
| | 1980 | +'enotif_body' => '$CHANGEDORCREATED can be one of {{msg-mw|changed}} and {{msg-mw|created}}. |
| 1981 | 1981 | |
| | 1982 | +$PAGEEDITDATEANDTIME is the date and time of the edit, alternatively |
| | 1983 | +$PAGEEDITDATE is the date of the edit, and |
| | 1984 | +$PAGEEDITTIME is the time of the edit. |
| | 1985 | +', |
| | 1986 | + |
| 1982 | 1987 | # Delete |
| 1983 | 1988 | 'confirm' => 'Submit button text for protection confirmation |
| 1984 | 1989 | |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2594,7 +2594,7 @@ |
| 2595 | 2595 | 'enotif_body' => 'Dear $WATCHINGUSERNAME, |
| 2596 | 2596 | |
| 2597 | 2597 | |
| 2598 | | -The {{SITENAME}} page $PAGETITLE has been $CHANGEDORCREATED on $PAGEEDITDATE by $PAGEEDITOR. $REVINFO |
| | 2598 | +The {{SITENAME}} page $PAGETITLE has been $CHANGEDORCREATED on $PAGEEDITDATEANDTIME by $PAGEEDITOR. $REVINFO |
| 2599 | 2599 | |
| 2600 | 2600 | $NEWPAGE |
| 2601 | 2601 | |
| — | — | @@ -2611,7 +2611,7 @@ |
| 2612 | 2612 | |
| 2613 | 2613 | -- |
| 2614 | 2614 | To change your watchlist settings, visit |
| 2615 | | -{{fullurl:{{ns:special}}:Watchlist/edit}} |
| | 2615 | +{{fullurl:{{#special:Watchlist}}/edit}} |
| 2616 | 2616 | |
| 2617 | 2617 | Feedback and further assistance: |
| 2618 | 2618 | {{fullurl:{{MediaWiki:Helppage}}}}', |