From 12ff737980bc11ebe083db7c14a54f788f259390 Mon Sep 17 00:00:00 2001 From: Elliott Eggleston Date: Mon, 7 Oct 2019 16:24:37 +0200 Subject: [PATCH 1/1] Update 'Thank You' & other corrections in message templates --- tests/phpunit/CRM/Contribute/Form/ContributionTest.php | 2 +- tests/phpunit/CRM/Core/Payment/BaseIPNTest.php | 4 ++-- tests/phpunit/CRM/Event/Form/Registration/ConfirmTest.php | 4 ++-- tests/phpunit/api/v3/ContributionTest.php | 2 +- tests/phpunit/api/v3/PaymentTest.php | 2 +- .../message_templates/contribution_offline_receipt_html.tpl | 3 +-- .../message_templates/contribution_offline_receipt_text.tpl | 3 +-- .../contribution_recurring_notify_html.tpl | 2 +- .../contribution_recurring_notify_text.tpl | 2 +- .../message_templates/event_online_receipt_html.tpl | 6 +++--- .../message_templates/event_online_receipt_text.tpl | 6 +++--- .../message_templates/membership_offline_receipt_html.tpl | 2 +- .../message_templates/membership_offline_receipt_text.tpl | 2 +- .../message_templates/participant_confirm_html.tpl | 1 + .../message_templates/participant_confirm_text.tpl | 2 ++ .../payment_or_refund_notification_html.tpl | 2 +- .../payment_or_refund_notification_text.tpl | 2 +- .../message_templates/pledge_acknowledge_subject.tpl | 2 +- 18 files changed, 25 insertions(+), 24 deletions(-) diff --git a/tests/phpunit/CRM/Contribute/Form/ContributionTest.php b/tests/phpunit/CRM/Contribute/Form/ContributionTest.php index 1638cd5237..a66eb2cefd 100644 --- 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.', '', ]); $mut->stop(); diff --git a/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php b/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php index 112bea8f69..454028a58e 100644 --- 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 358389669a..f7f229fdb1 100644 --- 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 Registered', + 'This is a confirmation that your registration has been received and your status has been updated to Registered', ]); $mut->clearMessages(); } diff --git a/tests/phpunit/api/v3/ContributionTest.php b/tests/phpunit/api/v3/ContributionTest.php index a18af89f2b..0a41129aa7 100644 --- 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 69f2374288..c5725dae91 100644 --- 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 312ba71d1b..0b2a22415c 100644 --- 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}

{$formValues.receipt_text|htmlize}

{else} -

{ts}Thank you for your support.{/ts}

+

{ts}Below you will find a receipt for this contribution.{/ts}

{/if} - diff --git a/xml/templates/message_templates/contribution_offline_receipt_text.tpl b/xml/templates/message_templates/contribution_offline_receipt_text.tpl index a45c6df75a..2012417303 100644 --- 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 201a5596f3..b5a7412beb 100644 --- a/xml/templates/message_templates/contribution_recurring_notify_html.tpl +++ b/xml/templates/message_templates/contribution_recurring_notify_html.tpl @@ -94,7 +94,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/contribution_recurring_notify_text.tpl b/xml/templates/message_templates/contribution_recurring_notify_text.tpl index 19251cdba9..687d61e91f 100644 --- 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 f3431df855..bdc8429932 100644 --- a/xml/templates/message_templates/event_online_receipt_html.tpl +++ b/xml/templates/message_templates/event_online_receipt_html.tpl @@ -31,9 +31,9 @@

{$event.confirm_email_text|htmlize}

{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}{/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/event_online_receipt_text.tpl b/xml/templates/message_templates/event_online_receipt_text.tpl index 93d7341a68..610caf5c4f 100644 --- 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 97d5089e13..5b93559d2d 100644 --- 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}

{$formValues.receipt_text_renewal|htmlize}

{else} -

{ts}Thank you for your support.{/ts}

+

{ts}Thank you for this contribution.{/ts}

{/if} diff --git a/xml/templates/message_templates/membership_offline_receipt_text.tpl b/xml/templates/message_templates/membership_offline_receipt_text.tpl index 4ae65ed9dc..e48eb4617a 100644 --- 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 e2e5e18a86..c4535e42d3 100644 --- a/xml/templates/message_templates/participant_confirm_html.tpl +++ b/xml/templates/message_templates/participant_confirm_html.tpl @@ -22,6 +22,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/participant_confirm_text.tpl b/xml/templates/message_templates/participant_confirm_text.tpl index dbadd74834..6296b4594d 100644 --- 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 ec62bbd324..a038a67c7d 100644 --- 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} - {ts}Thank you for completing payment.{/ts} + {ts}Thank you for completing this payment.{/ts} {/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 348d8cbfea..1b0d798140 100644 --- 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 9648c9c71b..ce0c992859 100644 --- 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} -- 2.25.1