From 87424a253349434a5b43d8644fb1bac9e17141ec Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Tue, 4 Aug 2020 13:04:37 -0400
Subject: [PATCH] dev/core#1905 rework #17942 with simpler ts strings

---
 templates/CRM/Contribute/Form/Contribution/Main.tpl | 4 ++--
 templates/CRM/Event/Form/Registration/Register.tpl  | 4 ++--
 templates/CRM/Price/Form/PriceSet.tpl               | 7 +++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/templates/CRM/Contribute/Form/Contribution/Main.tpl b/templates/CRM/Contribute/Form/Contribution/Main.tpl
index c9f9e671d258..5e7e66e467e5 100644
--- a/templates/CRM/Contribute/Form/Contribution/Main.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/Main.tpl
@@ -57,8 +57,8 @@
   {/if}
 
   {if call_user_func(array('CRM_Core_Permission','check'), 'administer CiviCRM') }
-    {capture assign="configureURL"}{crmURL p="civicrm/admin/contribute/settings" q="reset=1&action=update&id=`$contributionPageID`"}{/capture}
-    {ts 1=$configureURL}<a class="button " target="_blank" href=%1><i aria-hidden="true" title="Configure Contribution Page" class="crm-i fa-wrench"></i> Configure</a>{/ts}
+    {capture assign="buttonTitle"}{ts}Configure Contribution Page{/ts}{/capture}
+    {crmButton target="_blank" p="civicrm/admin/contribute/settings" q="reset=1&action=update&id=`$contributionPageID`" title="$buttonTitle" icon="fa-wrench"}{ts}Configure{/ts}{/crmButton}
     <div class='clear'></div>
   {/if}
   {include file="CRM/common/TrackingFields.tpl"}
diff --git a/templates/CRM/Event/Form/Registration/Register.tpl b/templates/CRM/Event/Form/Registration/Register.tpl
index a686920a7816..80df777fe9d5 100644
--- a/templates/CRM/Event/Form/Registration/Register.tpl
+++ b/templates/CRM/Event/Form/Registration/Register.tpl
@@ -8,8 +8,8 @@
  +--------------------------------------------------------------------+
 *}
 {if call_user_func(array('CRM_Core_Permission','check'), 'administer CiviCRM') }
-  {capture assign="configureURL"}{crmURL p="civicrm/event/manage/settings" q="reset=1&action=update&id=`$event.id`"}{/capture}
-  {ts 1=$configureURL}<a class="button " target="_blank" href=%1><i aria-hidden="true" title="Configure Event" class="crm-i fa-wrench"></i> Configure</a>{/ts}
+  {capture assign="buttonTitle"}{ts}Configure Event{/ts}{/capture}
+  {crmButton target="_blank" p="civicrm/event/manage/settings" q="reset=1&action=update&id=`$event.id`" title="$buttonTitle" icon="fa-wrench"}{ts}Configure{/ts}{/crmButton}
   <div class='clear'></div>
 {/if}
 {* Callback snippet: Load payment processor *}
diff --git a/templates/CRM/Price/Form/PriceSet.tpl b/templates/CRM/Price/Form/PriceSet.tpl
index aef67b901092..480f9b9e3f11 100644
--- a/templates/CRM/Price/Form/PriceSet.tpl
+++ b/templates/CRM/Price/Form/PriceSet.tpl
@@ -17,11 +17,10 @@
     {if call_user_func(array('CRM_Core_Permission','check'), 'administer CiviCRM') }
       {assign var='adminFld' value=true}
       {if $priceSet.id && !$priceSet.is_quick_config}
-        {capture assign="priceSetURL"}{crmURL p="civicrm/admin/price/field" q="reset=1&action=browse&sid=`$priceSet.id`"}{/capture}
         <div class='float-right'>
-          {ts 1=$priceSetURL}<a class="crm-hover-button" target="_blank" href=%1>
-            <i aria-hidden="true" title="Edit Priceset" class="crm-i fa-wrench"></i>
-          </a>{/ts}
+          <a class="crm-hover-button" target="_blank" href="{crmURL p="civicrm/admin/price/field" q="reset=1&action=browse&sid=`$priceSet.id`"}">
+            {icon icon="fa-wrench"}{ts}Edit Price Set{/ts}{/icon}
+          </a>
         </div>
       {/if}
     {/if}