Update 'Thank You' & other corrections in message templates

diff --git a/tests/phpunit/CRM/Contribute/Form/ContributionTest.php b/tests/phpunit/CRM/Contribute/Form/ContributionTest.php
index 1638cd5237b778762d5ed115116c001a70cafdc0..a66eb2cefd0c756ae60891d67c9abec71bfaac4d 100644 (file)
--- a/tests/phpunit/CRM/Contribute/Form/ContributionTest.php
+++ b/tests/phpunit/CRM/Contribute/Form/ContributionTest.php
@@ -634,7 +634,7 @@ class CRM_Contribute_Form_ContributionTest extends CiviUnitTestCase {
     ], CRM_Core_Action::ADD);
     $this->callAPISuccessGetCount('Contribution', ['contact_id' => $this->_individualId], 1);
     $mut->checkMailLog([
-      'Thank you for your support',
+      'Below you will find a receipt for this contribution.',
       '<testloggedin@example.com>',
     ]);
     $mut->stop();

diff --git a/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php b/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php
index 112bea8f69ec8c6abf54d291ce5403f535a4cb86..454028a58e536ad5ab47215e3a67870f5e4d6bf0 100644 (file)
--- a/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php
+++ b/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php
@@ -257,7 +257,7 @@ class CRM_Core_Payment_BaseIPNTest extends CiviUnitTestCase {
     $msg = $this->IPN->sendMail($this->input, $this->ids, $this->objects, $values, FALSE, TRUE);
     $this->assertTrue(is_array($msg), "Message returned as an array in line" . __LINE__);
     $this->assertEquals('Mr. Anthony Anderson II', $msg['to']);
-    $this->assertContains('Thank you for your participation', $msg['body']);
+    $this->assertContains('Thank you for your registration', $msg['body']);
   }
 
   /**
@@ -270,7 +270,7 @@ class CRM_Core_Payment_BaseIPNTest extends CiviUnitTestCase {
     $this->IPN->loadObjects($this->input, $this->ids, $this->objects, FALSE, $this->_processorId);
     $this->IPN->sendMail($this->input, $this->ids, $this->objects, $values, FALSE, FALSE);
     $mut->checkMailLog([
-      'Thank you for your participation',
+      'Thank you for your registration',
       'Annual CiviCRM meet',
       'Mr. Anthony Anderson II',
     ]);

diff --git a/tests/phpunit/CRM/Event/Form/Registration/ConfirmTest.php b/tests/phpunit/CRM/Event/Form/Registration/ConfirmTest.php
index 358389669af59ce39d61019e2815a7f60b158f37..f7f229fdb1747a3f8444a1f7c7406c4614cc6f19 100644 (file)
--- a/tests/phpunit/CRM/Event/Form/Registration/ConfirmTest.php
+++ b/tests/phpunit/CRM/Event/Form/Registration/ConfirmTest.php
@@ -80,7 +80,7 @@ class CRM_Event_Form_Registration_ConfirmTest extends CiviUnitTestCase {
     ]);
     $participant = $this->callAPISuccessGetSingle('Participant', []);
     $mut->checkMailLog([
-      'Dear Logged In,  Thank you for your participation.  This letter is a confirmation that your registration has been received and your status has been updated to Registered.',
+      'Dear Logged In,  Thank you for your registration.  This is a confirmation that your registration has been received and your status has been updated to Registered.',
     ]);
     $mut->stop();
     $mut->clearMessages();
@@ -212,7 +212,7 @@ class CRM_Event_Form_Registration_ConfirmTest extends CiviUnitTestCase {
       'Expires: January 2019',
       'Visa',
       '************1111',
-      'This letter is a confirmation that your registration has been received and your status has been updated to <strong> Registered</strong>',
+      'This is a confirmation that your registration has been received and your status has been updated to <strong> Registered</strong>',
     ]);
     $mut->clearMessages();
   }

diff --git a/tests/phpunit/api/v3/ContributionTest.php b/tests/phpunit/api/v3/ContributionTest.php
index a18af89f2bec56299d2fe97805c70c47c9b417de..0a41129aa7aaf3c6c30bd70b1ed0816549bc707c 100644 (file)
--- a/tests/phpunit/api/v3/ContributionTest.php
+++ b/tests/phpunit/api/v3/ContributionTest.php
@@ -3097,7 +3097,7 @@ class api_v3_ContributionTest extends CiviUnitTestCase {
     $mut->checkMailLog([
       'Annual CiviCRM meet',
       'Event',
-      'This letter is a confirmation that your registration has been received and your status has been updated to Registered.',
+      'This is a confirmation that your registration has been received and your status has been updated to Registered.',
       'First Name: Logged In',
       'Public title',
       'public 2',

diff --git a/tests/phpunit/api/v3/PaymentTest.php b/tests/phpunit/api/v3/PaymentTest.php
index 69f237428843ffef608cee212c0e3231dac59175..c5725dae9156cfc5b72a1771b600ba0911ba2f57 100644 (file)
--- a/tests/phpunit/api/v3/PaymentTest.php
+++ b/tests/phpunit/api/v3/PaymentTest.php
@@ -225,7 +225,7 @@ class api_v3_PaymentTest extends CiviUnitTestCase {
       'Total Fees: $ 300.00',
       'This Payment Amount: $ 150.00',
       'Balance Owed: $ 0.00',
-      'Thank you for completing payment.',
+      'Thank you for completing this payment.',
     ]);
     $mut->stop();
     $mut->clearMessages();

diff --git a/xml/templates/message_templates/contribution_offline_receipt_html.tpl b/xml/templates/message_templates/contribution_offline_receipt_html.tpl
index 312ba71d1ba46f94ec6ce6459ab46b03ee77dea6..0b2a22415ce3b56d54cc3c15df36032b67af36f5 100644 (file)
--- a/xml/templates/message_templates/contribution_offline_receipt_html.tpl
+++ b/xml/templates/message_templates/contribution_offline_receipt_html.tpl
@@ -25,9 +25,8 @@
     {if $formValues.receipt_text}
      <p>{$formValues.receipt_text|htmlize}</p>
     {else}
-     <p>{ts}Thank you for your support.{/ts}</p>
+     <p>{ts}Below you will find a receipt for this contribution.{/ts}</p>
     {/if}
-
    </td>
   </tr>
   <tr>

diff --git a/xml/templates/message_templates/contribution_offline_receipt_text.tpl b/xml/templates/message_templates/contribution_offline_receipt_text.tpl
index a45c6df75a912cb02151a7dbb70b2c5ee7f56cbc..2012417303498e1525d53ba89a3d87c0440a5b21 100644 (file)
--- a/xml/templates/message_templates/contribution_offline_receipt_text.tpl
+++ b/xml/templates/message_templates/contribution_offline_receipt_text.tpl
@@ -2,8 +2,7 @@
 
 {if $formValues.receipt_text}
 {$formValues.receipt_text}
-{else}{ts}Thank you for your support.{/ts}{/if}
-
+{else}{ts}Below you will find a receipt for this contribution.{/ts}{/if}
 
 ===========================================================
 {ts}Contribution Information{/ts}

diff --git a/xml/templates/message_templates/contribution_recurring_notify_html.tpl b/xml/templates/message_templates/contribution_recurring_notify_html.tpl
index 201a5596f39849e251226b1171814b1bfc4bf83e..b5a7412beb65a36193c8e4dd7c25b1fc3c79ff2c 100644 (file)
--- a/xml/templates/message_templates/contribution_recurring_notify_html.tpl
+++ b/xml/templates/message_templates/contribution_recurring_notify_html.tpl
@@ -94,7 +94,7 @@
       <tr>
        <td>
         <p>{ts}Your recurring contribution term has ended.{/ts}</p>
-        <p>{ts 1=$recur_installments}You have successfully completed %1 recurring contributions. Thank you for your support.{/ts}</p>
+        <p>{ts 1=$recur_installments}You have successfully completed %1 recurring contributions. Thank you.{/ts}</p>
        </td>
       </tr>
       <tr>

diff --git a/xml/templates/message_templates/contribution_recurring_notify_text.tpl b/xml/templates/message_templates/contribution_recurring_notify_text.tpl
index 19251cdba9183d25446869c13a89912807da5152..687d61e91fc4e75f130473b5b9d94d40bc0af402 100644 (file)
--- a/xml/templates/message_templates/contribution_recurring_notify_text.tpl
+++ b/xml/templates/message_templates/contribution_recurring_notify_text.tpl
@@ -49,7 +49,7 @@
 {ts}Your recurring contribution term has ended.{/ts}
 
 
-{ts 1=$recur_installments}You have successfully completed %1 recurring contributions. Thank you for your support.{/ts}
+{ts 1=$recur_installments}You have successfully completed %1 recurring contributions. Thank you.{/ts}
 
 
 ==================================================

diff --git a/xml/templates/message_templates/event_online_receipt_html.tpl b/xml/templates/message_templates/event_online_receipt_html.tpl
index f3431df855ede9d237f669c8259611c6870416e5..bdc84299326c749a38d70d2747b779c0cdb7ab0a 100644 (file)
--- a/xml/templates/message_templates/event_online_receipt_html.tpl
+++ b/xml/templates/message_templates/event_online_receipt_html.tpl
@@ -31,9 +31,9 @@
      <p>{$event.confirm_email_text|htmlize}</p>
 
     {else}
-     <p>{ts}Thank you for your participation.{/ts}
-     {if $participant_status}{ts 1=$participant_status}This letter is a confirmation that your registration has been received and your status has been updated to <strong> %1</strong>.{/ts}
-     {else}{if $isOnWaitlist}{ts}This letter is a confirmation that your registration has been received and your status has been updated to <strong>waitlisted</strong>.{/ts}{else}{ts}This letter is a confirmation that your registration has been received and your status has been updated to <strong>registered<strong>.{/ts}{/if}{/if}</p>
+     <p>{ts}Thank you for your registration.{/ts}
+     {if $participant_status}{ts 1=$participant_status}This is a confirmation that your registration has been received and your status has been updated to <strong> %1</strong>.{/ts}
+     {else}{if $isOnWaitlist}{ts}This is a confirmation that your registration has been received and your status has been updated to <strong>waitlisted</strong>.{/ts}{else}{ts}This is a confirmation that your registration has been received and your status has been updated to <strong>registered<strong>.{/ts}{/if}{/if}</p>
 
     {/if}
 

diff --git a/xml/templates/message_templates/event_online_receipt_text.tpl b/xml/templates/message_templates/event_online_receipt_text.tpl
index 93d7341a688e2af13915de216cd493ffb79a85eb..610caf5c4fb76d475e1765417a5bd141e9219c7d 100644 (file)
--- a/xml/templates/message_templates/event_online_receipt_text.tpl
+++ b/xml/templates/message_templates/event_online_receipt_text.tpl
@@ -3,9 +3,9 @@
 {$event.confirm_email_text}
 
 {else}
-  {ts}Thank you for your participation.{/ts}
-  {if $participant_status}{ts 1=$participant_status}This letter is a confirmation that your registration has been received and your status has been updated to %1.{/ts}
-  {else}{if $isOnWaitlist}{ts}This letter is a confirmation that your registration has been received and your status has been updated to waitlisted.{/ts}{else}{ts}This letter is a confirmation that your registration has been received and your status has been updated to registered.{/ts}{/if}
+  {ts}Thank you for your registration.{/ts}
+  {if $participant_status}{ts 1=$participant_status}This is a confirmation that your registration has been received and your status has been updated to %1.{/ts}
+  {else}{if $isOnWaitlist}{ts}This is a confirmation that your registration has been received and your status has been updated to waitlisted.{/ts}{else}{ts}This is a confirmation that your registration has been received and your status has been updated to registered.{/ts}{/if}
   {/if}
 {/if}
 

diff --git a/xml/templates/message_templates/membership_offline_receipt_html.tpl b/xml/templates/message_templates/membership_offline_receipt_html.tpl
index 97d5089e13ba485553e6f04125805574bafd3df7..5b93559d2d9f1c6df2a104682a1fccb1e4e91714 100644 (file)
--- a/xml/templates/message_templates/membership_offline_receipt_html.tpl
+++ b/xml/templates/message_templates/membership_offline_receipt_html.tpl
@@ -27,7 +27,7 @@
     {elseif $formValues.receipt_text_renewal}
      <p>{$formValues.receipt_text_renewal|htmlize}</p>
     {else}
-     <p>{ts}Thank you for your support.{/ts}</p>
+     <p>{ts}Thank you for this contribution.{/ts}</p>
     {/if}
    </td>
   </tr>

diff --git a/xml/templates/message_templates/membership_offline_receipt_text.tpl b/xml/templates/message_templates/membership_offline_receipt_text.tpl
index 4ae65ed9dce3787d99c80f34aa0c5a70ffe5ed67..e48eb4617aacbde3d9daed5cfc81288f07c260bf 100644 (file)
--- a/xml/templates/message_templates/membership_offline_receipt_text.tpl
+++ b/xml/templates/message_templates/membership_offline_receipt_text.tpl
@@ -4,7 +4,7 @@
 {$formValues.receipt_text_signup}
 {elseif $formValues.receipt_text_renewal}
 {$formValues.receipt_text_renewal}
-{else}{ts}Thank you for your support.{/ts}{/if}
+{else}{ts}Thank you for this contribution.{/ts}{/if}
 
 {if !$lineItem}
 ===========================================================

diff --git a/xml/templates/message_templates/participant_confirm_html.tpl b/xml/templates/message_templates/participant_confirm_html.tpl
index e2e5e18a86f83cd57771faa8c4b9c1159a53d54e..c4535e42d319bba87b56df295f0b760d45f5b7f2 100644 (file)
--- a/xml/templates/message_templates/participant_confirm_html.tpl
+++ b/xml/templates/message_templates/participant_confirm_html.tpl
@@ -22,6 +22,7 @@
   <tr>
    <td>
     {assign var="greeting" value="{contact.email_greeting}"}{if $greeting}<p>{$greeting},</p>{/if}
+    <p>{ts}This is an invitation to complete your registration that was initially waitlisted.{/ts}</p>
    </td>
   </tr>
   {if !$isAdditional and $participant.id}

diff --git a/xml/templates/message_templates/participant_confirm_text.tpl b/xml/templates/message_templates/participant_confirm_text.tpl
index dbadd748349a62c264a58bdfeaa1bf56ffec0522..6296b4594d76321131102b3a0876341451759be4 100644 (file)
--- a/xml/templates/message_templates/participant_confirm_text.tpl
+++ b/xml/templates/message_templates/participant_confirm_text.tpl
@@ -1,5 +1,7 @@
 {assign var="greeting" value="{contact.email_greeting}"}{if $greeting}{$greeting},{/if}
 
+{ts}This is an invitation to complete your registration that was initially waitlisted.{/ts}
+
 {if !$isAdditional and $participant.id}
 
 ===========================================================

diff --git a/xml/templates/message_templates/payment_or_refund_notification_html.tpl b/xml/templates/message_templates/payment_or_refund_notification_html.tpl
index ec62bbd3246e7466596101d73281f784c6661f24..a038a67c7d1ef3579db48c9d6c971380f40f43e1 100644 (file)
--- a/xml/templates/message_templates/payment_or_refund_notification_html.tpl
+++ b/xml/templates/message_templates/payment_or_refund_notification_html.tpl
@@ -94,7 +94,7 @@
       {if $paymentsComplete}
       <tr>
       <td colspan='2' {$valueStyle}>
-        {ts}Thank you for completing payment.{/ts}
+        {ts}Thank you for completing this payment.{/ts}
       </td>
      </tr>
       {/if}

diff --git a/xml/templates/message_templates/payment_or_refund_notification_text.tpl b/xml/templates/message_templates/payment_or_refund_notification_text.tpl
index 348d8cbfeadfe480248a7a463d6b2063d00c60a9..1b0d798140ed33882269c200f47ba600146bd4be 100644 (file)
--- a/xml/templates/message_templates/payment_or_refund_notification_text.tpl
+++ b/xml/templates/message_templates/payment_or_refund_notification_text.tpl
@@ -31,7 +31,7 @@
 
 {if $paymentsComplete}
 
-{ts}Thank you for completing payment.{/ts}
+{ts}Thank you for completing this payment.{/ts}
 {/if}
 {/if}
 {if $receive_date}

diff --git a/xml/templates/message_templates/pledge_acknowledge_subject.tpl b/xml/templates/message_templates/pledge_acknowledge_subject.tpl
index 9648c9c71ba7bfae983421d00b66a26c5a5c2b93..ce0c9928599db9de50f3a19a4c37ef58bf6538aa 100644 (file)
--- a/xml/templates/message_templates/pledge_acknowledge_subject.tpl
+++ b/xml/templates/message_templates/pledge_acknowledge_subject.tpl
@@ -1 +1 @@
-{ts}Thank you for your Pledge{/ts}
+{ts}Thank you for this pledge{/ts}