Fixup initial templates to have recipient vars

include/i18n/en_US/templates/email/message.autoresp.yaml

@@ -14,9 +14,9 @@ notes: |
 subject: |
     Message Confirmation
 body: |
-    <h3><strong>Dear %{ticket.name.first},</strong></h3>
+    <h3><strong>Dear %{recipient.name.first},</strong></h3>
     Your reply to support request <a
-    href="%{ticket.client_link}">#%{ticket.number}</a> has been noted
+    href="%{recipient.ticket_link}">#%{ticket.number}</a> has been noted
     <br>
     <br>
     <div style="color: rgb(127, 127, 127); ">
@@ -26,7 +26,7 @@ body: |
     <hr>
     <div style="color: rgb(127, 127, 127); font-size: small; text-align:
     center"><em>You can view the support request progress <a
-    href="%{ticket.client_link}">online here</a></em><br>
+    href="%{recipient.ticket_link}">online here</a></em><br>
     <a href="http://osticket.com/"><img
     src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc" alt="Powered by osTicket"
     width="126" height="19" style="width: 126px;"></a></div>

include/i18n/en_US/templates/email/ticket.activity.notice.yaml

@@ -27,9 +27,9 @@ body: |
     <hr>
     <div style="color: rgb(127, 127, 127); font-size: small; text-align: center;">
     <em>You're getting this email because you are a collaborator
-    on ticket <a href="%{ticket.client_link}" style="color: rgb(84, 141, 212);"
+    on ticket <a href="%{recipient.ticket_link}" style="color: rgb(84, 141, 212);"
     >#%{ticket.number}</a>.  To participate, simply reply to this email
-    or <a href="%{ticket.client_link}" style="color: rgb(84, 141, 212);"
+    or <a href="%{recipient.ticket_link}" style="color: rgb(84, 141, 212);"
     >click here</a> for a complete archive of the ticket thread.</em>
     </div>
     <div style="text-align: center;"> <a href="http://osticket.com/"><img

include/i18n/en_US/templates/email/ticket.autoreply.yaml

@@ -21,11 +21,11 @@ body: |
     float: right; margin: 0px 0px 10px 10px;">
     <br>
     <br>
-    <strong>Dear %{ticket.name.first},</strong>
+    <strong>Dear %{recipient.name.first},</strong>
     <br>
     <br>
     A request for support has been created and assigned ticket <a
-    href="%{ticket.client_link}">#%{ticket.number}</a> with the following
+    href="%{recipient.ticket_link}">#%{ticket.number}</a> with the following
     automatic reply
     <br>
     <br>
@@ -43,7 +43,7 @@ body: |
     <div style="color: rgb(127, 127, 127); font-size: small; text-align:
     center;"><em>We hope this response has sufficiently answered your questions.
     If not, please do not send another email. Instead, reply to this email
-    or <a href="%{ticket.client_link}"><span style="color: rgb(84, 141,
+    or <a href="%{recipient.ticket_link}"><span style="color: rgb(84, 141,
     212);" >login to your account</span></a> for a complete archive of all
     your support requests and responses.</em></div>
     <div style="text-align: center;">

include/i18n/en_US/templates/email/ticket.autoresp.yaml

@@ -25,7 +25,7 @@ body: |
     </tr>
     <tr>
         <td style="width:67%; padding-top: 12pt; padding-right: 12pt">
-            Dear %{ticket.name.first},
+            Dear %{recipient.name.first},
             <br>
             <br>
             We received your request and assigned ticket #%{ticket.number}
@@ -39,7 +39,7 @@ body: |
             <br>
             <br>
             A representative will follow-up with you as soon as possible.
-            You can <a href="%{ticket.client_link}">view this ticket's
+            You can <a href="%{recipient.ticket_link}">view this ticket's
             progress online</a>.
             <br>
             <br>
@@ -54,7 +54,7 @@ body: |
             <span style="color: rgb(127, 127, 127); "> If you wish to send
             additional comments or information regarding this issue, please
             don't open a new ticket. Simply</span> <a
-            href="%{ticket.client_link}"><span style="color: rgb(84, 141, 212);"
+            href="%{recipient.ticket_link}"><span style="color: rgb(84, 141, 212);"
             >login</span></a> <span style="color: rgb(127, 127, 127);"
             >and update the ticket.</span>
             <br>

include/i18n/en_US/templates/email/ticket.notice.yaml

@@ -19,11 +19,11 @@ body: |
     float: right; margin: 0px 0px 10px 10px;">
     <br>
     <br>
-    <strong>Dear %{ticket.name.first},</strong>
+    <strong>Dear %{recipient.name.first},</strong>
     <br>
     <br>
     Our customer care team has created a ticket, <a
-    href="%{ticket.client_link}">#%{ticket.number}</a> on your behalf, with
+    href="%{recipient.ticket_link}">#%{ticket.number}</a> on your behalf, with
     the following details and summary:
     <br>
     <br>
@@ -36,7 +36,7 @@ body: |
     <br>
     <br>
     If need be, a representative will follow-up with you as soon as
-    possible. You can also <a href="%{ticket.client_link}">view this
+    possible. You can also <a href="%{recipient.ticket_link}">view this
     ticket's progress online</a>.
     <br>
     <br>
@@ -47,7 +47,7 @@ body: |
     <div style="color: rgb(127, 127, 127); font-size: small; "><em>If you
     wish to provide additional comments or information regarding the issue,
     please do not send another email. Instead, reply to this email or <a
-    href="%{ticket.client_link}"><span style="color: rgb(84, 141, 212);"
+    href="%{recipient.ticket_link}"><span style="color: rgb(84, 141, 212);"
     >login to your account</span></a> for a complete archive of all your
     support requests and responses.</em></div>
     <br>

include/i18n/en_US/templates/email/ticket.reply.yaml

@@ -15,7 +15,7 @@ body: |
     width="113" height="64" style="float: right; width: 113px; margin: 0px 0px 10px 10px;">
     <h3><span style="color: rgb(127, 127, 127); font-weight: normal;
     font-family: Georgia; font-size: 30pt">We're Here For You</span></h3>
-    <strong>Dear %{ticket.name},</strong>
+    <strong>Dear %%{recipient.name},</strong>
     <br>
     <br>
     %{response}
@@ -29,7 +29,7 @@ body: |
     <div style="color: rgb(127, 127, 127); font-size: small; text-align: center;"
     ><em>We hope this response has sufficiently answered your questions. If
     not, please do not send another email. Instead, reply to this email or
-    <a href="%{ticket.client_link}" style="color: rgb(84, 141, 212);" >login
+    <a href="%{recipient.ticket_link}" style="color: rgb(84, 141, 212);" >login
     to your account</a> for a complete archive of all your support requests
     and responses.</em></div>
     <div style="text-align: center;">