jenkins-bot has submitted this change and it was merged.
Change subject: Copy tweaks to Echo Notification Emails
......................................................................
Copy tweaks to Echo Notification Emails
Bug: 47846
Change-Id: Ia054daa8053032e5b71a7724c22897655a7fc326
---
M Echo.i18n.php
M includes/EmailBatch.php
2 files changed, 9 insertions(+), 8 deletions(-)
Approvals:
Bsitu: Looks good to me, approved
EBernhardson (WMF): Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/Echo.i18n.php b/Echo.i18n.php
index e077a5b..c545c1f 100644
--- a/Echo.i18n.php
+++ b/Echo.i18n.php
@@ -75,7 +75,7 @@
'notification-new-user' => "Welcome to {{SITENAME}}, $1! We're glad
you're here.",
'notification-reverted2' => 'Your {{PLURAL:$4|edit on [[$2]] has|edits
on [[$2]] have}} been {{GENDER:$1|reverted}} by [[User:$1|$1]] $3',
'notification-reverted-flyout2' => 'Your {{PLURAL:$4|edit on <b>$2</b>
has|edits on <b>$2</b> have}} been {{GENDER:$1|reverted}} by <b>$1</b> $3',
- 'notification-edit-talk-page-email-subject2' => 'You have a new
talkpage message',
+ 'notification-edit-talk-page-email-subject2' => 'You have a new
talkpage message on {{SITENAME}}',
'notification-edit-talk-page-email-body2' => '$1
$3
@@ -95,7 +95,7 @@
$3',
'notification-page-linked-email-batch-body' => '$2 was
{{GENDER:$1|linked}} from $3',
- 'notification-reverted-email-subject2' => 'Your {{PLURAL:$3|edit on $2
was|edits on $2 were}} {{GENDER:$1|reverted}} by $1',
+ 'notification-reverted-email-subject2' => 'Your {{PLURAL:$3|edit on $2
was|edits on $2 were}} {{GENDER:$1|reverted}} by $1 on {{SITENAME}}',
'notification-reverted-email-body2' => 'Your {{PLURAL:$7|edit on $2 has
been|edits on $2 have been}} {{GENDER:$1|reverted}} by $1.
$5
@@ -162,17 +162,17 @@
// Email batch
'echo-email-batch-separator' =>
'________________________________________________', # only translate this
message to other languages if you have to change it
'echo-email-batch-bullet' => '•', # only translate this message to
other languages if you have to change it
- 'echo-email-batch-subject-daily' => 'You have {{PLURAL:$2|a new
notification|new notifications}} today',
- 'echo-email-batch-subject-weekly' => 'You have {{PLURAL:$2|a new
notification|new notifications}} this week',
- 'echo-email-batch-body-daily' => '$1,
+ 'echo-email-batch-subject-daily' => 'You have {{PLURAL:$2|a new
notification|new notifications}} at {{SITENAME}}',
+ 'echo-email-batch-subject-weekly' => 'You have {{PLURAL:$2|a new
notification|new notifications}} at {{SITENAME}} this week',
+ 'echo-email-batch-body-daily' => 'Hi $1,
-You have {{PLURAL:$3|a new notification|new notifications}} on {{SITENAME}}
today. View {{PLURAL:$3|it|them}} here:
+You have {{PLURAL:$3|a new notification|new notifications}} on {{SITENAME}}.
View {{PLURAL:$3|it|them}} here:
{{canonicalurl:{{#special:Notifications}}}}
$4
$5',
- 'echo-email-batch-body-weekly' => '$1,
+ 'echo-email-batch-body-weekly' => 'Hi $1,
You have {{PLURAL:$3|a new notification|new notifications}} on {{SITENAME}}
this week. View {{PLURAL:$3|it|them}} here:
{{canonicalurl:{{#special:Notifications}}}}
diff --git a/includes/EmailBatch.php b/includes/EmailBatch.php
index f238b22..7a2f271 100644
--- a/includes/EmailBatch.php
+++ b/includes/EmailBatch.php
@@ -187,7 +187,8 @@
// * echo-category-title-reverted
// * echo-category-title-article-linked
// * echo-category-title-mention
- $output = wfMessage( 'echo-category-title-' . $category
)->numParams( count( $notifs ) )->text() . "\n";
+ $output = wfMessage( 'echo-category-title-' . $category
)->numParams( count( $notifs ) )->text()
+ . wfMessage( 'colon-separator' )->text() . "\n";
foreach( $notifs as $notif ) {
$output .= "\n " . wfMessage(
'echo-email-batch-bullet' )->text() . ' ' . $notif;
--
To view, visit https://gerrit.wikimedia.org/r/61477
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia054daa8053032e5b71a7724c22897655a7fc326
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Lwelling <lwell...@wikimedia.org>
Gerrit-Reviewer: Bsitu <bs...@wikimedia.org>
Gerrit-Reviewer: EBernhardson (WMF) <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Kaldari <rkald...@wikimedia.org>
Gerrit-Reviewer: Siebrand <siebr...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
