Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91906
Change subject: WIP: Fix Echo email notifications
......................................................................
WIP: Fix Echo email notifications
Change-Id: Idad0e7b8590a4b2e5071420f74cedf3174bb4d65
---
M OpenStackManager.i18n.php
M OpenStackManager.php
2 files changed, 26 insertions(+), 6 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager
refs/changes/06/91906/1
diff --git a/OpenStackManager.i18n.php b/OpenStackManager.i18n.php
index 5f58bc2..3fc118f 100644
--- a/OpenStackManager.i18n.php
+++ b/OpenStackManager.i18n.php
@@ -428,8 +428,14 @@
'openstackmanager-deletedpuppetvar' => 'Deleted Puppet variable.',
'openstackmanager-failedtodeletepuppetvar' => 'Failed to delete Puppet
variable.',
- 'openstackmanager-email-subject' => 'Your instance is ready to be
logged into.',
- 'openstackmanager-email-body' => 'The following instance has been
created, and is ready to be logged into:',
+ 'notification-osm-instance-build-completed-email-subject' => 'Your
instance is ready to be logged into.',
+ 'notification-osm-instance-build-completed-email-batch-body' => 'The
following instance has been created by $1, and is ready to be logged into: $2',
+ 'notification-osm-instance-reboot-completed-email-subject' => 'An
instance has been rebooted.',
+ 'notification-osm-instance-reboot-completed-email-batch-body' => 'The
following instance has been rebooted by $1: $2',
+ 'notification-osm-instance-deleted-email-subject' => 'Instance \'$1\'
has been deleted',
+ 'notification-osm-instance-deleted-email-batch-body' => 'The following
instance has been deleted by $1: $2',
+ 'notification-osm-projectmember-added-email-subject' => 'User $2 has
been added to $3',
+ 'notification-osm-projectmember-added-email-batch-body' => '$1 has
added $2 to the $3 project',
'openstackmanager-twofactorrequired' => 'Two-factor authentication
required',
'openstackmanager-twofactorrequired2' => 'Two-factor authentication is
required. Please enable it and try again.',
diff --git a/OpenStackManager.php b/OpenStackManager.php
index 6d67f7d..8d75df7 100644
--- a/OpenStackManager.php
+++ b/OpenStackManager.php
@@ -313,7 +313,10 @@
'title-message' => 'notification-osm-instance-build-completed',
'title-params' => array( 'agent', 'title', 'instance' ),
'icon' => 'placeholder',
- 'payload' => array( 'summary' )
+ 'payload' => array( 'summary' ),
+ 'email-subject-message' =>
'notification-osm-instance-build-completed-email-subject',
+ 'email-body-batch-message' =>
'notification-osm-instance-build-completed-email-batch-body',
+ 'email-body-batch-params' => array( 'agent', 'instance' ),
);
$wgEchoNotificationCategories['osm-instance-build-completed'] = array(
'priority' => 10
@@ -327,7 +330,10 @@
'title-message' => 'notification-osm-instance-reboot-completed',
'title-params' => array( 'agent', 'title', 'instance' ),
'icon' => 'placeholder',
- 'payload' => array( 'summary' )
+ 'payload' => array( 'summary' ),
+ 'email-subject-message' =>
'notification-osm-instance-reboot-completed-email-subject',
+ 'email-body-batch-message' =>
'notification-osm-instance-reboot-completed-email-batch-body',
+ 'email-body-batch-params' => array( 'agent', 'instance' ),
);
$wgEchoNotificationCategories['osm-instance-reboot-completed'] = array(
'priority' => 10
@@ -340,7 +346,11 @@
'title-message' => 'notification-osm-instance-deleted',
'title-params' => array( 'agent', 'title', 'instance' ),
'icon' => 'trash',
- 'payload' => array( 'summary' )
+ 'payload' => array( 'summary' ),
+ 'email-subject-message' =>
'notification-osm-instance-deleted-email-subject',
+ 'email-subject-params' => array( 'instance' ),
+ 'email-body-batch-message' =>
'notification-osm-instance-deleted-email-batch-body',
+ 'email-body-batch-params' => array( 'agent', 'instance' ),
);
$wgEchoNotificationCategories['osm-instance-deleted'] = array(
'priority' => 10
@@ -354,7 +364,11 @@
'title-message' => 'notification-osm-projectmember-added',
'title-params' => array( 'agent', 'title' ),
'icon' => 'placeholder',
- 'payload' => array( 'summary' )
+ 'payload' => array( 'summary' ),
+ 'email-subject-message' =>
'notification-osm-projectmember-added-email-subject',
+ 'email-subject-params' => array( 'title', 'project' ),
+ 'email-body-batch-message' =>
'notification-osm-projectmember-added-email-batch-body',
+ 'email-body-batch-params' => array( 'agent', 'title', 'project' ),
);
$wgDefaultUserOptions["echo-subscriptions-web-osm-projectmembers-add"] = true;
$wgDefaultUserOptions["echo-subscriptions-email-osm-projectmembers-add"] =
true;
--
To view, visit https://gerrit.wikimedia.org/r/91906
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idad0e7b8590a4b2e5071420f74cedf3174bb4d65
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
