From b1dd67bffec3255775e692fe2015079b07f61ae5 Mon Sep 17 00:00:00 2001 From: larssandergreen Date: Thu, 21 Sep 2023 12:55:26 -0600 Subject: [PATCH] More Smarty 3+ prep --- ext/ckeditor4/templates/CRM/Ckeditor4/Form/CKEditorConfig.tpl | 2 +- templates/CRM/Admin/Form/ContactType.tpl | 4 ++-- templates/CRM/Admin/Form/Preferences/Address.tpl | 2 +- templates/CRM/Case/Form/ActivityTab.tpl | 4 ++-- templates/CRM/Contact/Form/Domain.tpl | 2 +- templates/CRM/Contact/Form/Edit/Address.tpl | 4 ++-- templates/CRM/Contact/Form/Inline/Address.tpl | 4 ++-- templates/CRM/Contact/Form/RelatedContact.tpl | 2 +- templates/CRM/Contribute/Form/AdditionalInfo/Premium.tpl | 2 +- templates/CRM/Contribute/Form/Contribution/Main.tpl | 2 +- templates/CRM/Event/Form/Registration/Confirm.tpl | 2 +- templates/CRM/Event/Form/Registration/ThankYou.tpl | 2 +- templates/CRM/Import/Form/DataSource.tpl | 2 +- templates/CRM/Profile/Form/Dynamic.tpl | 2 +- templates/CRM/Profile/Page/Dynamic.tpl | 2 +- templates/CRM/Profile/Page/Listings.tpl | 2 +- templates/CRM/common/checkUsernameAvailable.tpl | 2 +- 17 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ext/ckeditor4/templates/CRM/Ckeditor4/Form/CKEditorConfig.tpl b/ext/ckeditor4/templates/CRM/Ckeditor4/Form/CKEditorConfig.tpl index ae51de9d18..47e8f4f744 100644 --- a/ext/ckeditor4/templates/CRM/Ckeditor4/Form/CKEditorConfig.tpl +++ b/ext/ckeditor4/templates/CRM/Ckeditor4/Form/CKEditorConfig.tpl @@ -47,7 +47,7 @@ {/literal} {* Force the custom config file to reload by appending a new query string *}
diff --git a/templates/CRM/Admin/Form/ContactType.tpl b/templates/CRM/Admin/Form/ContactType.tpl index 5cf5a33111..2f257d3894 100644 --- a/templates/CRM/Admin/Form/ContactType.tpl +++ b/templates/CRM/Admin/Form/ContactType.tpl @@ -19,7 +19,7 @@ {$form.label.label} {if $action eq 2} - {include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contact_type' field='label' id= $cid} + {include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contact_type' field='label' id=$cid} {/if} {$form.label.html} @@ -48,7 +48,7 @@ {$form.description.label} {if $action eq 2} - {include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contact_type' field='description' id= $cid} + {include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contact_type' field='description' id=$cid} {/if} {$form.description.html} diff --git a/templates/CRM/Admin/Form/Preferences/Address.tpl b/templates/CRM/Admin/Form/Preferences/Address.tpl index 399e54ecc1..bf8d1656b2 100644 --- a/templates/CRM/Admin/Form/Preferences/Address.tpl +++ b/templates/CRM/Admin/Form/Preferences/Address.tpl @@ -42,7 +42,7 @@ {help id="id-token-text" tplFile=$tplFile file="CRM/Contact/Form/Task/Email.hlp"}
{$form.address_format.html|crmAddClass:huge12}
- {ts}Format for displaying addresses in the Contact Summary and Event Information screens.{/ts}
{ts 1={contact.state_province} 2={contact.state_province_name}}Use %1 for state/province abbreviation or %2 for state province name.{/ts} + {ts}Format for displaying addresses in the Contact Summary and Event Information screens.{/ts}
{ts 1="{contact.state_province}" 2="{contact.state_province_name}"}Use %1 for state/province abbreviation or %2 for state province name.{/ts} diff --git a/templates/CRM/Case/Form/ActivityTab.tpl b/templates/CRM/Case/Form/ActivityTab.tpl index 2b778bbcc4..683da8bf18 100644 --- a/templates/CRM/Case/Form/ActivityTab.tpl +++ b/templates/CRM/Case/Form/ActivityTab.tpl @@ -31,12 +31,12 @@ - {assign var=activitylow value=activity_date_low_$caseID} + {assign var=activitylow value="activity_date_low_`$caseID`"} {$form.$activitylow.label}
{$form.$activitylow.html} - {assign var=activityhigh value=activity_date_high_$caseID} + {assign var=activityhigh value="activity_date_high_`$caseID`"} {$form.$activityhigh.label}
{$form.$activityhigh.html} diff --git a/templates/CRM/Contact/Form/Domain.tpl b/templates/CRM/Contact/Form/Domain.tpl index d1328bff1c..cd5536da6e 100644 --- a/templates/CRM/Contact/Form/Domain.tpl +++ b/templates/CRM/Contact/Form/Domain.tpl @@ -27,7 +27,7 @@

{ts}Default Organization Address{/ts}

-
{ts 1={domain.address}}CiviMail mailings must include the sending organization's address. This is done by putting the %1 token in either the body or footer of the mailing. This token may also be used in regular 'Email - send now' messages and in other Message Templates. The token is replaced by the address entered below when the message is sent.{/ts}
+
{ts 1="{domain.address}"}CiviMail mailings must include the sending organization's address. This is done by putting the %1 token in either the body or footer of the mailing. This token may also be used in regular 'Email - send now' messages and in other Message Templates. The token is replaced by the address entered below when the message is sent.{/ts}
{include file="CRM/Contact/Form/Edit/Address.tpl" blockId=1 masterAddress='' parseStreetAddress='' className=''}

{ts}Organization Contact Information{/ts}

{ts}You can also include general email and/or phone contact information in mailings.{/ts} {help id="additional-contact"}
diff --git a/templates/CRM/Contact/Form/Edit/Address.tpl b/templates/CRM/Contact/Form/Edit/Address.tpl index 6a1365111e..b0da0bf2ff 100644 --- a/templates/CRM/Contact/Form/Edit/Address.tpl +++ b/templates/CRM/Contact/Form/Edit/Address.tpl @@ -50,9 +50,9 @@ {* build address block w/ address sequence. *} {foreach item=addressElement from=$addressSequence} - {include file=CRM/Contact/Form/Edit/Address/$addressElement.tpl} + {include file="CRM/Contact/Form/Edit/Address/`$addressElement`.tpl"} {/foreach} - {include file=CRM/Contact/Form/Edit/Address/geo_code.tpl} + {include file="CRM/Contact/Form/Edit/Address/geo_code.tpl"}
diff --git a/templates/CRM/Contact/Form/Inline/Address.tpl b/templates/CRM/Contact/Form/Inline/Address.tpl index 2a9ceebcea..1985b3a6de 100644 --- a/templates/CRM/Contact/Form/Inline/Address.tpl +++ b/templates/CRM/Contact/Form/Inline/Address.tpl @@ -43,9 +43,9 @@ {* build address block w/ address sequence. *} {foreach item=addressElement from=$addressSequence} - {include file=CRM/Contact/Form/Edit/Address/$addressElement.tpl} + {include file="CRM/Contact/Form/Edit/Address/`$addressElement`.tpl"} {/foreach} - {include file=CRM/Contact/Form/Edit/Address/geo_code.tpl} + {include file="CRM/Contact/Form/Edit/Address/geo_code.tpl"}
diff --git a/templates/CRM/Contact/Form/RelatedContact.tpl b/templates/CRM/Contact/Form/RelatedContact.tpl index e4eebab4a1..0a226a1755 100644 --- a/templates/CRM/Contact/Form/RelatedContact.tpl +++ b/templates/CRM/Contact/Form/RelatedContact.tpl @@ -9,7 +9,7 @@ *} {* This file provides the HTML for the edit Related contact form *} -{include file=CRM/Contact/Form/OnBehalfOf.tpl} +{include file="CRM/Contact/Form/OnBehalfOf.tpl"}
{$form.buttons.html} diff --git a/templates/CRM/Contribute/Form/AdditionalInfo/Premium.tpl b/templates/CRM/Contribute/Form/AdditionalInfo/Premium.tpl index 143603cd34..54eb89fb34 100644 --- a/templates/CRM/Contribute/Form/AdditionalInfo/Premium.tpl +++ b/templates/CRM/Contribute/Form/AdditionalInfo/Premium.tpl @@ -50,7 +50,7 @@ } {/literal} var index = 1; - {foreach from= $mincontribution item=amt key=id} + {foreach from=$mincontribution item=amt key=id} {literal}amount[index]{/literal} = "{$amt}" {literal}index = index + 1{/literal} {/foreach} diff --git a/templates/CRM/Contribute/Form/Contribution/Main.tpl b/templates/CRM/Contribute/Form/Contribution/Main.tpl index 3eb4ea7441..4c30868480 100644 --- a/templates/CRM/Contribute/Form/Contribution/Main.tpl +++ b/templates/CRM/Contribute/Form/Contribution/Main.tpl @@ -169,7 +169,7 @@
{/if} {if $showMainEmail} - {assign var=n value=email-$bltID} + {assign var=n value="email-`$bltID`"}
{$form.$n.label}
diff --git a/templates/CRM/Event/Form/Registration/Confirm.tpl b/templates/CRM/Event/Form/Registration/Confirm.tpl index 1f10fcc25d..a546f2b650 100644 --- a/templates/CRM/Event/Form/Registration/Confirm.tpl +++ b/templates/CRM/Event/Form/Registration/Confirm.tpl @@ -51,7 +51,7 @@ {include file="CRM/Price/Page/LineItem.tpl" context="Event"} {elseif $amounts || $amount == 0}
- {foreach from= $amounts item=amount key=level} + {foreach from=$amounts item=amount key=level}
{$amount.amount|crmMoney}  {$amount.label}
diff --git a/templates/CRM/Event/Form/Registration/ThankYou.tpl b/templates/CRM/Event/Form/Registration/ThankYou.tpl index 8bfee5d1eb..313d62e388 100644 --- a/templates/CRM/Event/Form/Registration/ThankYou.tpl +++ b/templates/CRM/Event/Form/Registration/ThankYou.tpl @@ -84,7 +84,7 @@ {include file="CRM/Price/Page/LineItem.tpl" context="Event"} {elseif $amount || $amount == 0}
- {foreach from= $finalAmount item=amount key=level} + {foreach from=$finalAmount item=amount key=level}
{$amount.amount|crmMoney}  {$amount.label}
diff --git a/templates/CRM/Import/Form/DataSource.tpl b/templates/CRM/Import/Form/DataSource.tpl index 6abd033d5d..88d64ea81a 100644 --- a/templates/CRM/Import/Form/DataSource.tpl +++ b/templates/CRM/Import/Form/DataSource.tpl @@ -19,7 +19,7 @@
{/if}
- {ts 1=$importEntity 2= $importEntities}The %1 Import Wizard allows you to easily upload %2 from other applications into CiviCRM.{/ts} + {ts 1=$importEntity 2=$importEntities}The %1 Import Wizard allows you to easily upload %2 from other applications into CiviCRM.{/ts}

{ts}Choose Data Source{/ts}

diff --git a/templates/CRM/Profile/Form/Dynamic.tpl b/templates/CRM/Profile/Form/Dynamic.tpl index 48b749cb2d..61bb25deee 100644 --- a/templates/CRM/Profile/Form/Dynamic.tpl +++ b/templates/CRM/Profile/Form/Dynamic.tpl @@ -8,7 +8,7 @@ +--------------------------------------------------------------------+ *}
-{crmRegion name=profile-form-`$ufGroupName`} +{crmRegion name="profile-form-`$ufGroupName`"} {* Profile forms when embedded in CMS account create (mode=1) or cms account edit (mode=8) or civicrm/profile (mode=4) pages *} diff --git a/templates/CRM/Profile/Page/Dynamic.tpl b/templates/CRM/Profile/Page/Dynamic.tpl index 06141322f1..aa304b828b 100644 --- a/templates/CRM/Profile/Page/Dynamic.tpl +++ b/templates/CRM/Profile/Page/Dynamic.tpl @@ -14,7 +14,7 @@ {else}
- {crmRegion name=profile-view-`$ufGroupName`} + {crmRegion name="profile-view-`$ufGroupName`"} {foreach from=$profileFields item=field key=rowName}
diff --git a/templates/CRM/Profile/Page/Listings.tpl b/templates/CRM/Profile/Page/Listings.tpl index ddc355a262..6ae7f9ed8d 100644 --- a/templates/CRM/Profile/Page/Listings.tpl +++ b/templates/CRM/Profile/Page/Listings.tpl @@ -9,7 +9,7 @@ *}
-{crmRegion name=profile-search-`$ufGroupName`} +{crmRegion name="profile-search-`$ufGroupName`"} {* make sure there are some fields in the selector *} {if ! empty($columnHeaders) || $isReset} diff --git a/templates/CRM/common/checkUsernameAvailable.tpl b/templates/CRM/common/checkUsernameAvailable.tpl index d8be9aada7..d2414d4a9a 100644 --- a/templates/CRM/common/checkUsernameAvailable.tpl +++ b/templates/CRM/common/checkUsernameAvailable.tpl @@ -8,7 +8,7 @@ +--------------------------------------------------------------------+ *} {* This included tpl checks if a given username is taken or available. *} -{crmSigner var=checkUserSig for=civicrm/ajax/cmsuser} +{crmSigner var=checkUserSig for="civicrm/ajax/cmsuser"} {literal} var lastName = null; cj("#checkavailability").click(function() { -- 2.25.1