From 4a64b91572e5f340c854b51290c05e577e74f855 Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Thu, 29 Sep 2016 10:31:17 -0400
Subject: [PATCH] CRM-19429 - CiviEvent: clarify text for when email is sent on
 status change

---
 CRM/Event/Form/Task/Batch.php           |  3 ++-
 templates/CRM/Event/Form/Task/Batch.tpl | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CRM/Event/Form/Task/Batch.php b/CRM/Event/Form/Task/Batch.php
index de821255b8..170271c705 100644
--- a/CRM/Event/Form/Task/Batch.php
+++ b/CRM/Event/Form/Task/Batch.php
@@ -523,7 +523,8 @@ class CRM_Event_Form_Task_Batch extends CRM_Event_Form_Task {
     $notifyingStatuses = array_intersect($notifyingStatuses, CRM_Event_PseudoConstant::participantStatus());
     $this->assign('status', TRUE);
     if (!empty($notifyingStatuses)) {
-      $this->assign('notifyingStatuses', implode(', ', $notifyingStatuses));
+      $s = '<em>' . implode('</em>, <em>', $notifyingStatuses) . '</em>';
+      $this->assign('notifyingStatuses', $s);
     }
   }
 
diff --git a/templates/CRM/Event/Form/Task/Batch.tpl b/templates/CRM/Event/Form/Task/Batch.tpl
index 969c77205e..b9fba9250e 100644
--- a/templates/CRM/Event/Form/Task/Batch.tpl
+++ b/templates/CRM/Event/Form/Task/Batch.tpl
@@ -27,15 +27,17 @@
 <fieldset>
   <div class="help">
     {if $context EQ 'statusChange'} {* Update Participant Status task *}
-      {ts}Update the status for each participant individually, OR change all statuses to:{/ts}
+      {ts}Update the status for each participant individually below, or change all statuses to:{/ts}
       {$form.status_change.html}  {help id="id-status_change"}
       {if $status}
         <div class="status">
-          {ts}Participants whose status is changed FROM Pending Pay Later TO Registered or Attended will receive a confirmation email and their payment status will be set to completed. If this is not you want to do, you can change their participant status by editing their event registration record directly.{/ts}
+          <p>{ts}This form <strong>will send email</strong> to contacts only in certain circumstances:{/ts}</p>
+          <ul>
+            <li>{ts}<strong>Resolving "Pay Later" registrations:</strong> Participants whose status is changed from <em>Pending Pay Later</em> to <em>Registered</em> or <em>Attended</em> will receive a confirmation email and their payment status will be set to completed. If this is not you want to do, you can change their participant status by editing their event registration record directly.{/ts}</li>
           {if $notifyingStatuses}
-            <br />
-            {ts 1=$notifyingStatuses}Participants whose status is changed TO any of the following will be automatically notified via email: %1{/ts}
+            <li>{ts 1=$notifyingStatuses}<strong>Special statuses:</strong> Participants whose status is changed to any of the following will be automatically notified via email: %1{/ts}</li>
           {/if}
+          </ul>
         </div>
       {/if}
     {else}
-- 
2.25.1