Mattflaschen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/368331 )
Change subject: Split minoredit into minoredit and enotif_minoredit
......................................................................
Split minoredit into minoredit and enotif_minoredit
This allows minoredit to have links, while enotif_minoredit can
not.
Change-Id: I7aff9e5a5e6d460f6fce7da36a32e4717b247e4c
---
M includes/mail/EmailNotification.php
M languages/i18n/en.json
M languages/i18n/qqq.json
3 files changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/31/368331/1
diff --git a/includes/mail/EmailNotification.php
b/includes/mail/EmailNotification.php
index 932797a..2931d9d 100644
--- a/includes/mail/EmailNotification.php
+++ b/includes/mail/EmailNotification.php
@@ -343,7 +343,7 @@
$keys['$PAGETITLE'] = $this->title->getPrefixedText();
$keys['$PAGETITLE_URL'] = $this->title->getCanonicalURL();
$keys['$PAGEMINOREDIT'] = $this->minorEdit ?
- wfMessage( 'minoredit' )->inContentLanguage()->text() :
'';
+ wfMessage( 'enotif_minoredit'
)->inContentLanguage()->text() : '';
$keys['$UNWATCHURL'] = $this->title->getCanonicalURL(
'action=unwatch' );
if ( $this->editor->isAnon() ) {
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 6fec714..2f09573 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -2236,6 +2236,7 @@
"enotif_lastdiff": "To view this change, see $1",
"enotif_anon_editor": "anonymous 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_minoredit": "This is a minor edit",
"created": "created",
"changed": "changed",
"deletepage": "Delete page",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index eae1eac..c0d6ad5 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -2426,6 +2426,7 @@
"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_anon_editor": "User name in an email notification when
referring to an anonymous user. Parameters:\n* $1 - the anonymous user name
(i.e. an IP address).",
"enotif_body": "Text 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*$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|Enotify body}} message. This can use magic words like
{{GRAMMAR}}. However, it will not be parsed, so you can not use wikitext (e.g.
links) that generates HTML.\n{{Identical|minoredit}}",
"created": "{{Optional}}\nPossible value for $CHANGEDORCREATED in the
following messages:\n* {{msg-mw|enotif_subject}}\n*
{{msg-mw|enotif_body}}\n{{Identical|Created}}",
"changed": "{{Optional}}\nPossible value for $CHANGEDORCREATED in the
following messages:\n* {{msg-mw|Enotif subject}}\n* {{msg-mw|Enotif body}}",
"deletepage": "Used as Submit button text.\n{{Identical|Delete page}}",
--
To view, visit https://gerrit.wikimedia.org/r/368331
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7aff9e5a5e6d460f6fce7da36a32e4717b247e4c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
