Split date, and time, in Mediawiki:enotif_body, and show localized special page name...

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index a288378..d7dbff9 100644 (file)
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -582,8 +582,13 @@ class EmailNotification {
                # $PAGEEDITDATE is the time and date of the page change
                # expressed in terms of individual local time of the notification
                # recipient, i.e. watching user
-               $body = str_replace('$PAGEEDITDATE',
-                       $wgContLang->timeanddate( $this->timestamp, true, false, $timecorrection ),
+               $body = str_replace(
+                       array(  '$PAGEEDITDATEANDTIME',
+                               '$PAGEEDITDATE',
+                               '$PAGEEDITTIME' ),
+                       array(  $wgContLang->timeanddate( $this->timestamp, true, false, $timecorrection ),
+                               $wgContLang->date( $this->timestamp, true, false, $timecorrection ),
+                               $wgContLang->time( $this->timestamp, true, false, $timecorrection ) ),
                        $body);
 
                return UserMailer::send($to, $this->from, $this->subject, $body, $this->replyto);

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index b13d591..0dbf723 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2594,7 +2594,7 @@ Future changes to this page and its associated talk page will be listed there, a
 'enotif_body'                  => 'Dear $WATCHINGUSERNAME,
 
 
-The {{SITENAME}} page $PAGETITLE has been $CHANGEDORCREATED on $PAGEEDITDATE by $PAGEEDITOR. $REVINFO
+The {{SITENAME}} page $PAGETITLE has been $CHANGEDORCREATED on $PAGEEDITDATEANDTIME by $PAGEEDITOR. $REVINFO
 
 $NEWPAGE
 
@@ -2611,7 +2611,7 @@ You could also reset the notification flags for all your watched pages on your w
 
 --
 To change your watchlist settings, visit
-{{fullurl:{{ns:special}}:Watchlist/edit}}
+{{fullurl:{{#special:Watchlist}}/edit}}
 
 Feedback and further assistance:
 {{fullurl:{{MediaWiki:Helppage}}}}',

diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index f501bb8..665a0b8 100644 (file)
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -1976,7 +1976,12 @@ Special:EmailUser appears when you click on the link "E-mail this user" in the s
 'deleted'         => '{{Identical|Deleted}}',
 'enotif_subject'  => '$CHANGEDORCREATED can be one of {{msg|changed}} and {{msg|created}}.',
 'enotif_rev_info' => 'Substituted as $REVINFO in {{msg-mw|enotif body|notext=1}}',
-'enotif_body'     => '$CHANGEDORCREATED can be one of {{msg-mw|changed}} and {{msg-mw|created}}.',
+'enotif_body'     => '$CHANGEDORCREATED can be one of {{msg-mw|changed}} and {{msg-mw|created}}.
+
+$PAGEEDITDATEANDTIME is the date and time of the edit, alternatively
+$PAGEEDITDATE is the date of the edit, and
+$PAGEEDITTIME is the time of the edit.
+',
 
 # Delete
 'confirm'                => 'Submit button text for protection confirmation