jenkins-bot has submitted this change and it was merged.
Change subject: Bring back messages used by old email formatter system
......................................................................
Bring back messages used by old email formatter system
Bug: T135446
Change-Id: I235db93c0f50424da8bc30bcafd717c50a6b0b62
(cherry picked from commit 46e69972c679f7fdab44bc914b9dfb2491a33fee)
---
M i18n/en.json
M i18n/qqq.json
M includes/EmailFormatter.php
3 files changed, 6 insertions(+), 2 deletions(-)
Approvals:
Dereckson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 49a020b..16a99e2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -194,6 +194,8 @@
"echo-email-subject-default": "New notification at {{SITENAME}}",
"echo-email-body-default": "You have a new notification at
{{SITENAME}}:\n\n$1",
"echo-email-batch-body-default": "You have a new notification.",
+ "echo-email-footer-default-html": "To control which emails we send you,
<a href=\"$2\" style=\"text-decoration:none; color: #3868B0;\">check your
preferences</a>.<br />\n$1",
+ "echo-email-footer-default": "$2\n\nTo control which emails we send
you, check your
preferences:\n{{canonicalurl:{{#special:Preferences}}#mw-prefsection-echo}}\n\n$1",
"echo-email-plain-footer": "To control which emails we send you, check
your preferences:",
"echo-email-html-footer": "To control which emails we send you, <a
href=\"$2\" style=\"text-decoration:none; color: #3868B0;\">check your
preferences</a>.<br />\n$1",
"echo-notification-alert": "{{PLURAL:$1|Alert ($1)|Alerts
($1)|100=Alerts (99+)}}",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 7ab8302..c5a88e3 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -185,6 +185,8 @@
"echo-email-subject-default": "Default subject for Echo e-mail
notifications",
"echo-email-body-default": "Default message content for Echo email
notifications. Parameters:\n* $1 - a plain text description of the
notification",
"echo-email-batch-body-default": "Default message for Echo e-mail
digest notifications",
+ "echo-email-footer-default": "Default footer content for Echo text
e-mail notifications. Parameters:\n* $1 - the address of the organization that
sent the email\n* $2 - \"-------...\"
({{msg-mw|echo-email-batch-separator}})\n\nFor HTML version, see
{{msg-mw|echo-email-footer-default-html}}.",
+ "echo-email-footer-default-html": "Default footer content for Echo html
e-mail notifications. Parameters:\n* $1 - the address of the organization that
sent the email\n* $2 - the URL to the notification preference page\nFor
plain-text version, see {{msg-mw|Echo-email-footer-default}}.",
"echo-email-plain-footer": "Footer content for Echo text e-mail
notifications.\n\nFor HTML version, see {{msg-mw|echo-email-html-footer}}.",
"echo-email-html-footer": "Default footer content for Echo html e-mail
notifications. Parameters:\n* $1 - the address of the organization that sent
the email\n* $2 - the URL to the notification preference page\nFor plain-text
version, see {{msg-mw|Echo-email-footer-default}}.",
"echo-notification-alert": "Label for alert notifications (= non
discussion notifications) tab in Echo overlay. Parameters:\n* $1 - the number
of unread alerts. The number cannot be higher than 100.\nSee also:\n*
{{msg-mw|Echo-notification-message}}\n{{Identical|Alert}}",
diff --git a/includes/EmailFormatter.php b/includes/EmailFormatter.php
index 21bed12..2b79bd1 100644
--- a/includes/EmailFormatter.php
+++ b/includes/EmailFormatter.php
@@ -667,7 +667,7 @@
* {@inheritDoc}
*/
public function decorateFooter( $address, User $user ) {
- return EchoEmailMode::message( 'echo-email-plain-footer', $user
)
+ return EchoEmailMode::message( 'echo-email-footer-default',
$user )
->params(
$address,
EchoEmailMode::message(
'echo-email-batch-separator', $user )->text()
@@ -770,7 +770,7 @@
$title = SpecialPage::getTitleFor( 'Preferences' );
$title->setFragment( "#mw-prefsection-echo" );
- return EchoEmailMode::message( 'echo-email-html-footer', $user )
+ return EchoEmailMode::message(
'echo-email-footer-default-html', $user )
->params( $address )
->rawParams( $title->getFullURL( '', false, PROTO_HTTPS
) )
->text();
--
To view, visit https://gerrit.wikimedia.org/r/289268
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I235db93c0f50424da8bc30bcafd717c50a6b0b62
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: wmf/1.28.0-wmf.2
Gerrit-Owner: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Dereckson <dereck...@espace-win.org>
Gerrit-Reviewer: Sbisson <sbis...@wikimedia.org>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
