Merge pull request #14465 from philmb/dev/core#1010

#1010 pledge_acknowledge template - capitalization and greeting

CRM/Upgrade/Incremental/MessageTemplates.php

@@ -112,6 +112,15 @@ class CRM_Upgrade_Incremental_MessageTemplates {
           ['name' => 'payment_or_refund_notification', 'type' => 'html'],
         ],
       ],
+      [
+        'version' => '5.14',
+        'upgrade_descriptor' => ts('Use email greeting and fix capitalization'),
+        'label' => ts('Pledge acknowledgement'),
+        'templates' => [
+          ['name' => 'pledge_acknowledge', 'type' => 'text'],
+          ['name' => 'pledge_acknowledge', 'type' => 'html'],
+        ],
+      ],
     ];
   }
 

xml/templates/message_templates/pledge_acknowledge_html.tpl

@@ -21,8 +21,8 @@
 
   <tr>
    <td>
-    <p>{ts 1=$contact.display_name}dear %1{/ts},</p>
-    <p>{ts}thank you for your generous pledge. please print this acknowledgment for your records.{/ts}</p>
+    {assign var="greeting" value="{contact.email_greeting}"}{if $greeting}<p>{$greeting},</p>{/if}
+    <p>{ts}Thank you for your generous pledge. Please print this acknowledgment for your records.{/ts}</p>
    </td>
   </tr>
   <tr>

xml/templates/message_templates/pledge_acknowledge_text.tpl

-{ts 1=$contact.display_name}Dear %1{/ts},
+{assign var="greeting" value="{contact.email_greeting}"}{if $greeting}<p>{$greeting},</p>{/if}
 
 {ts}Thank you for your generous pledge. Please print this acknowledgment for your records.{/ts}