refs #39156, do_not_notify when bulk add contact to event. correct typo

Author: jimyhuang

CRM/Contribute/BAO/ContributionPage.php

@@ -376,7 +376,7 @@ static function sendMail($contactID, &$values, $isTest = FALSE, $returnMessageTe
       $contactDetail = CRM_Contact_BAO_Contact::getContactDetails($contactID);
       if (isset($contactDeatil[5]) && !empty($contactDetail[5])) {
         CRM_Core_Error::debug_log_message("Skipped email notify {$sendTemplateParams['valueName']} for contact $contactID due to do_not_notify marked");
-        $message = ts('Email has NOT been sent to %1 contact(s) - communication preferences specify DO NOT NOTIFY OR valid Email is NOT present. ', array(1 => '1'));
+        $message = ts('Email has NOT been sent to %1 contact(s) - communication preferences specify DO NOT NOTIFY OR valid Email is NOT present.', array(1 => '1'));
         CRM_Core_Session::singleton()->setStatus($message);
         return;
       }

CRM/Event/BAO/Event.php

@@ -1201,7 +1201,7 @@ static function sendMail($contactID, &$values, $participantId, $isTest = FALSE,
           $contactDetail = CRM_Contact_BAO_Contact::getContactDetails($contactID);
           if (!empty($contactDetail[5])) {
             CRM_Core_Error::debug_log_message("Skipped email notify {$sendTemplateParams['valueName']} for contact $contactID due to do_not_notify marked");
-            $message = ts('Email has NOT been sent to %1 contact(s) - communication preferences specify DO NOT NOTIFY OR valid Email is NOT present. ', array(1 => '1'));
+            $message = ts('Email has NOT been sent to %1 contact(s) - communication preferences specify DO NOT NOTIFY OR valid Email is NOT present.', array(1 => '1'));
             CRM_Core_Session::singleton()->setStatus($message);
             return;
           }

CRM/Event/BAO/Participant.php

@@ -1524,7 +1524,7 @@ static function sendTransitionParticipantMail($participantId,
       if (isset($contactDeatil[5]) && !empty($contactDetail[5])) {
         $mtype = strtolower($mailType);
         CRM_Core_Error::debug_log_message("Skipped email notify participant_{$mtype} for contact {$participantValues['contact_id']} due to do_not_notify marked");
-        $message = ts('Email has NOT been sent to %1 contact(s) - communication preferences specify DO NOT NOTIFY OR valid Email is NOT present. ', array(1 => '1'));
+        $message = ts('Email has NOT been sent to %1 contact(s) - communication preferences specify DO NOT NOTIFY OR valid Email is NOT present.', array(1 => '1'));
         CRM_Core_Session::singleton()->setStatus($message);
         return;
       }

CRM/Event/Form/Participant.php

@@ -1665,6 +1665,10 @@ public function postProcess() {
         $this->_contributorDisplayName = $contactDetails[0];
         $this->_contributorEmail = $contactDetails[1];
         $this->_toDoNotNotify = $contactDetails[5];
+        if (!empty($this->_toDoNotNotify)) {
+          $notSent[] = $contactID;
+          continue;
+        }
 
         $this->_contributorDisplayName = ($this->_contributorDisplayName == ' ') ? $this->_contributorEmail : $this->_contributorDisplayName;
         $this->assign('contactID', $contactID);
@@ -1809,10 +1813,10 @@ public function postProcess() {
       else {
         $statusMsg = ts('Total Participant(s) added to event: %1.', array(1 => count($this->_contactIds)));
         if (count($notSent) > 0) {
-          $statusMsg .= ' ' . ts('Email has NOT been sent to %1 contact(s) - communication preferences specify DO NOT EMAIL OR valid Email is NOT present. ', array(1 => count($notSent)));
+          $statusMsg .= '<br>' . ts('Email has NOT been sent to %1 contact(s) - communication preferences specify DO NOT NOTIFY OR valid Email is NOT present.', array(1 => count($notSent)));
         }
         elseif (isset($params['send_receipt'])) {
-          $statusMsg .= ' ' . ts('A confirmation email has been scheduled to sent to ALL participants');
+          $statusMsg .= '<br>' . ts('A confirmation email has been scheduled to sent to ALL participants');
         }
       }
     }