Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "mail: Link to page log if not to a diff"

Browse source
This commit is contained in:
jenkins-bot 2023-11-13 11:38:45 +00:00 committed by Gerrit Code Review
commit 4cd17c3f1e
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
includes/mail/EmailNotification.php
View file

@ -386,10 +386,16 @@ class EmailNotification {
)->inContentLanguage()->text();
}
$keys['$OLDID'] = $this->oldid;
$keys['$PAGELOG'] = '';
} else {
# clear $OLDID placeholder in the message template
// If there is no revision to link to, link to the page log, which should have details. See T115183.
$keys['$OLDID'] = '';
$keys['$NEWPAGE'] = '';
$keys['$PAGELOG'] = "\n\n" . wfMessage(
'enotif_pagelog',
SpecialPage::getTitleFor( 'Log' )->getCanonicalURL( [ 'page' => $this->title->getPrefixedDBkey() ] )
)->inContentLanguage()->text();
}
$keys['$PAGETITLE'] = $this->title->getPrefixedText();

3
languages/i18n/en.json
View file

@ -2529,9 +2529,10 @@
"enotif_body_intro_changed": "The {{SITENAME}} page $1 has been {{GENDER:$2|changed}} on $PAGEEDITDATE by $2, see $3 for the current revision.",
"enotif_lastvisited": "For all changes since your last visit, see $1",
"enotif_lastdiff": "To view this change, see $1",
"enotif_pagelog": "To view the log of this page, see $1",
"enotif_anon_editor": "anonymous user $1",
"enotif_temp_editor": "temporary user $1",
"enotif_body": "Dear $WATCHINGUSERNAME,\n\n$PAGEINTRO $NEWPAGE\n\nEditor's summary: $PAGESUMMARY $PAGEMINOREDIT\n\nContact the editor:\nmail: $PAGEEDITOR_EMAIL\nwiki: $PAGEEDITOR_WIKI\n\nThere will be no other notifications in case of further activity unless you visit this page while logged in. You could also reset the notification flags for all your watched pages on your watchlist.\n\nYour friendly {{SITENAME}} notification system\n\n--\nTo change your email notification settings, visit\n{{canonicalurl:{{#special:Preferences}}}}\n\nTo change your watchlist settings, visit\n{{canonicalurl:{{#special:EditWatchlist}}}}\n\nTo delete the page from your watchlist, visit\n$UNWATCHURL\n\nFeedback and further assistance:\n$HELPPAGE",
"enotif_body": "Dear $WATCHINGUSERNAME,\n\n$PAGEINTRO $NEWPAGE $PAGELOG\n\nEditor's summary: $PAGESUMMARY $PAGEMINOREDIT\n\nContact the editor:\nmail: $PAGEEDITOR_EMAIL\nwiki: $PAGEEDITOR_WIKI\n\nThere will be no other notifications in case of further activity unless you visit this page while logged in. You could also reset the notification flags for all your watched pages on your watchlist.\n\nYour friendly {{SITENAME}} notification system\n\n--\nTo change your email notification settings, visit\n{{canonicalurl:{{#special:Preferences}}}}\n\nTo change your watchlist settings, visit\n{{canonicalurl:{{#special:EditWatchlist}}}}\n\nTo delete the page from your watchlist, visit\n$UNWATCHURL\n\nFeedback and further assistance:\n$HELPPAGE",
"enotif_minoredit": "This is a minor edit",
"deletepage-deletetalk": "Delete associated talk page",
"deletepage-submit": "Delete page",

3
languages/i18n/qqq.json
View file

@ -2783,9 +2783,10 @@
"enotif_body_intro_changed": "Email notification body intro for pages that get changed. Parameters:\n* $1 - the page title\n* $2 - the page editor\n* $3 - page URL",
"enotif_lastvisited": "Parameters:\n* $1 - a URL which points to diff\nSee also:\n* {{msg-mw|Enotif lastdiff}}",
"enotif_lastdiff": "Email notification text to the latest page differences. Parameters:\n* $1 - a link which points to a diff, shown as a plain link\nSee also:\n* {{msg-mw|Enotif lastvisited}}",
"enotif_pagelog": "Email notification text to point to the full log of a page. Parameters:\n* $1 - a link which points to a page log, shown as a plain link",
"enotif_anon_editor": "Username in an email notification when referring to an anonymous user. Parameters:\n* $1 - the anonymous username (i.e. an IP address).",
"enotif_temp_editor": "Username in an email notification when referring to a temporary user. Parameters:\n* $1 - the temporary username.",
"enotif_body": "{{doc-important|Neither PLURAL nor GENDER are actually supported at the moment, at least until [[phab:T24769]] got resolved.}}\nText of a notification email sent when a watched page has been edited or deleted.\n[[File:Screenshot_MediaWiki_e-mail_notifier.PNG|150px|right]]\n\nRefers to {{msg-mw|Helppage}}.\n\nParameters:\n*$WATCHINGUSERNAME is the username of the user receiving the notification.\n*$PAGEINTRO is the first line of the message, saying what happened. It currently can be either of:\n**{{msg-mw|Enotif body intro deleted}}\n**{{msg-mw|Enotif body intro created}}\n**{{msg-mw|Enotif body intro moved}}\n**{{msg-mw|Enotif body intro restored}}\n**{{msg-mw|Enotif body intro changed}} (for all the other cases).\n*$NEWPAGE consists of either\n**if the page is new (in older releases), {{msg-mw|Enotif newpagetext}}\n**if the page has a previous revision,\n***{{msg-mw|Enotif lastdiff}}\n***a newline\n***{{msg-mw|Enotif lastvisited}}\n*$PAGEMINOREDIT shown with minor edits, {{msg-mw|Enotif minoredit}}\n*$PAGEEDITOR_EMAIL and $PAGEEDITOR_WIKI are links respectively to the email user special page and user page for the user who performed the action.\n*$PAGEEDITOR is the username of the user who performed the action.\n*$HELPPAGE is the full URL to the help page, defined by {{msg-mw|helppage}}.\n\nThe subject of the email is one of the following messages:\n*{{msg-mw|Enotif subject deleted}}\n*{{msg-mw|Enotif subject created}}\n*{{msg-mw|Enotif subject moved}}\n*{{msg-mw|Enotif subject restored}}\n*{{msg-mw|Enotif subject changed}}",
"enotif_body": "{{doc-important|Neither PLURAL nor GENDER are actually supported at the moment, at least until [[phab:T24769]] got resolved.}}\nText of a notification email sent when a watched page has been edited or deleted.\n[[File:Screenshot_MediaWiki_e-mail_notifier.PNG|150px|right]]\n\nRefers to {{msg-mw|Helppage}}.\n\nParameters:\n*$WATCHINGUSERNAME is the username of the user receiving the notification.\n*$PAGEINTRO is the first line of the message, saying what happened. It currently can be either of:\n**{{msg-mw|Enotif body intro deleted}}\n**{{msg-mw|Enotif body intro created}}\n**{{msg-mw|Enotif body intro moved}}\n**{{msg-mw|Enotif body intro restored}}\n**{{msg-mw|Enotif body intro changed}} (for all the other cases).\n*$NEWPAGE consists of either\n**if the page is new (in older releases), {{msg-mw|Enotif newpagetext}}\n**if the page has a previous revision,\n***{{msg-mw|Enotif lastdiff}}\n***a newline\n***{{msg-mw|Enotif lastvisited}}\n*$PAGELOG is {{msg-mw|Enotif pagelog}} if there is no previous revision, and is blank otherwise.\n*$PAGEMINOREDIT shown with minor edits, {{msg-mw|Enotif minoredit}}\n*$PAGEEDITOR_EMAIL and $PAGEEDITOR_WIKI are links respectively to the email user special page and user page for the user who performed the action.\n*$PAGEEDITOR is the username of the user who performed the action.\n*$HELPPAGE is the full URL to the help page, defined by {{msg-mw|helppage}}.\n\nThe subject of the email is one of the following messages:\n*{{msg-mw|Enotif subject deleted}}\n*{{msg-mw|Enotif subject created}}\n*{{msg-mw|Enotif subject moved}}\n*{{msg-mw|Enotif subject restored}}\n*{{msg-mw|Enotif subject changed}}",
"enotif_minoredit": "Possible value (it's empty string for non-minor edits) in the {{msg-mw|Enotif body|notext=1}} message. This can use magic words like <nowiki>{{GRAMMAR}}</nowiki>. However, it will not be parsed, so you can not use wikitext (e.g. links) that generates HTML.\n{{Identical|minoredit}}",
"deletepage-deletetalk": "Label of the checkbox to delete the associated talk page to the page you are deleting.",
"deletepage-submit": "Used as Submit button text.\n{{Identical|Delete page}}",