Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/125219
Change subject: Use an actual URL for helppage in enotif_body
......................................................................
Use an actual URL for helppage in enotif_body
The helppage can be a full URL, which canonicalurl doesn't like.
This means that if a wiki
* has a custom enotif_body which uses canonicalurl + helppage, but
* doesn't have helppage defined locally (as local/interwiki title),
then it will still have to fix either of the two locally.
Bug: 63269
Change-Id: I82d26b648ef23b69ae4fbd0a74ffa23eb7a93dae
---
M includes/UserMailer.php
M languages/i18n/en.json
2 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/19/125219/1
diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index de4457d..552539a6 100644
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -767,6 +767,7 @@
}
$keys['$PAGEEDITOR_WIKI'] =
$this->editor->getUserPage()->getCanonicalURL();
+ $keys['$HELPPAGE'] = Skin::makeInternalOrExternalUrl(
wfMessage( 'helppage' )->inContentLanguage()->text() );
# Replace this after transforming the message, bug 35019
$postTransformKeys['$PAGESUMMARY'] = $this->summary == '' ? ' -
' : $this->summary;
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 00745d8..55be015 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1859,7 +1859,7 @@
"enotif_lastvisited": "See $1 for all changes since your last visit.",
"enotif_lastdiff": "See $1 to view this change.",
"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{{canonicalurl:{{MediaWiki:Helppage}}}}",
+ "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",
"created": "created",
"changed": "changed",
"deletepage": "Delete page",
--
To view, visit https://gerrit.wikimedia.org/r/125219
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I82d26b648ef23b69ae4fbd0a74ffa23eb7a93dae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nemo bis <federicol...@tiscali.it>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
