From c995124eb8d14b43a8f5f146399d7a39ce5d98f2 Mon Sep 17 00:00:00 2001
From: Bradley Taylor <hello@brad-taylor.co.uk>
Date: Thu, 23 Dec 2021 16:20:37 +0000
Subject: [PATCH] Wrap another set of hardcoded strings in {ts}

---
 CRM/PCP/BAO/PCP.php                            | 2 +-
 CRM/Pledge/Form/Pledge.php                     | 2 +-
 CRM/Report/Form/Contribute/Summary.php         | 2 +-
 CRM/UF/Form/Group.php                          | 4 +++-
 templates/CRM/Contact/Form/Merge.tpl           | 6 +++---
 templates/CRM/Contact/Page/DedupeException.tpl | 2 +-
 templates/CRM/Mailing/Page/Report.tpl          | 2 +-
 templates/CRM/Member/Form/MembershipView.tpl   | 2 +-
 templates/CRM/UF/Form/AdvanceSetting.tpl       | 2 +-
 9 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/CRM/PCP/BAO/PCP.php b/CRM/PCP/BAO/PCP.php
index 9b6afa3dc5..3cd88f0a4c 100644
--- a/CRM/PCP/BAO/PCP.php
+++ b/CRM/PCP/BAO/PCP.php
@@ -610,7 +610,7 @@ WHERE pcp.id = %1 AND cc.contribution_status_id = %2 AND cc.is_test = 0";
     CRM_Core_Session::setStatus(ts("%1 status has been updated to %2.", [
       1 => $pcpTitle,
       2 => $pcpStatus,
-    ]), 'Status Updated', 'success');
+    ]), ts('Status Updated'), 'success');
 
     // send status change mail
     $result = self::sendStatusUpdate($id, $is_active, FALSE, $pcpPageType);
diff --git a/CRM/Pledge/Form/Pledge.php b/CRM/Pledge/Form/Pledge.php
index d3759d761d..5543b6cfe7 100644
--- a/CRM/Pledge/Form/Pledge.php
+++ b/CRM/Pledge/Form/Pledge.php
@@ -210,7 +210,7 @@ class CRM_Pledge_Form_Pledge extends CRM_Core_Form {
     $defaults = [];
 
     $paneNames = [
-      'Payment Reminders' => 'PaymentReminders',
+      ts('Payment Reminders') => 'PaymentReminders',
     ];
     foreach ($paneNames as $name => $type) {
       $urlParams = "snippet=4&formType={$type}";
diff --git a/CRM/Report/Form/Contribute/Summary.php b/CRM/Report/Form/Contribute/Summary.php
index 82ae379f50..0d829bf8be 100644
--- a/CRM/Report/Form/Contribute/Summary.php
+++ b/CRM/Report/Form/Contribute/Summary.php
@@ -1014,7 +1014,7 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form {
         $mode[] = CRM_Utils_Money::format($modeDAO->amount, $modeDAO->currency);
       }
       else {
-        $mode[] = 'N/A';
+        $mode[] = ts('N/A');
       }
     }
     return $mode;
diff --git a/CRM/UF/Form/Group.php b/CRM/UF/Form/Group.php
index 07a03b6267..a270ae03ed 100644
--- a/CRM/UF/Form/Group.php
+++ b/CRM/UF/Form/Group.php
@@ -201,7 +201,9 @@ class CRM_UF_Form_Group extends CRM_Core_Form {
     // is this group active ?
     $this->addElement('checkbox', 'is_active', ts('Is this CiviCRM Profile active?'));
 
-    $paneNames = ['Advanced Settings' => 'buildAdvanceSetting'];
+    $paneNames = [
+      ts('Advanced Settings') => 'buildAdvanceSetting',
+    ];
 
     foreach ($paneNames as $name => $type) {
       if ($this->_id) {
diff --git a/templates/CRM/Contact/Form/Merge.tpl b/templates/CRM/Contact/Form/Merge.tpl
index 28ca7fb156..704bd7fffa 100644
--- a/templates/CRM/Contact/Form/Merge.tpl
+++ b/templates/CRM/Contact/Form/Merge.tpl
@@ -59,7 +59,7 @@
       <th>{$otherContactTypeIcon} <a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=$other_cid"}">{$other_name|escape}</a> ({ts}duplicate{/ts})</th>
       <th>{ts}Mark All{/ts}<br />=={$form.toggleSelect.html} ==&gt;</th>
       <th>{$mainContactTypeIcon}<a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=$main_cid"}">{$main_name|escape}</a></th>
-      <th width="300">Add/overwrite?</th>
+      <th width="300">{ts}Add/overwrite?{/ts}</th>
     </tr>
 
 
@@ -155,7 +155,7 @@
               <span id="main_{$blockName}_{$blockId}_overwrite" class="location_block_controls">
 
                 <span class="location_primary">
-                  {if $row.main && $row.main_is_primary == "1"}Primary{/if}
+                  {if $row.main && $row.main_is_primary == "1"}{ts}Primary{/ts}{/if}
                 </span>
 
                 <span class="location_block_controls_options">
@@ -283,7 +283,7 @@
 
     // Update primary label
     if (mainBlock != false && mainBlock['is_primary'] == '1') {
-      this_controls.find(".location_primary").text('Primary');
+      this_controls.find(".location_primary").text('{/literal}{ts escape='js'}Primary{/ts}{literal}');
     }
     else {
       this_controls.find(".location_primary").text('');
diff --git a/templates/CRM/Contact/Page/DedupeException.tpl b/templates/CRM/Contact/Page/DedupeException.tpl
index e2ab1a3198..1c46d00de5 100644
--- a/templates/CRM/Contact/Page/DedupeException.tpl
+++ b/templates/CRM/Contact/Page/DedupeException.tpl
@@ -21,7 +21,7 @@
         </td>
         <td class="crm-contact-form-block-search">
           <label>&nbsp;</label><br />
-          <button type="submit" class="button crm-button filtercontacts"><span><i class="crm-i fa-search" aria-hidden="true"></i> Find Contacts</span></button>
+          <button type="submit" class="button crm-button filtercontacts"><span><i class="crm-i fa-search" aria-hidden="true"></i> {ts}Find Contacts{/ts}</span></button>
         </td>
       </tr>
     </table>
diff --git a/templates/CRM/Mailing/Page/Report.tpl b/templates/CRM/Mailing/Page/Report.tpl
index 703fe253c1..2687722196 100644
--- a/templates/CRM/Mailing/Page/Report.tpl
+++ b/templates/CRM/Mailing/Page/Report.tpl
@@ -140,7 +140,7 @@
 <td>{if $row.unique > 0}<a href="{$row.link_unique}">{$row.unique}</a>{else}{$row.unique}{/if}</td>
 <td>{$row.rate|string_format:"%0.2f"}%</td>
 <td><a href="{$row.url}">{$row.url}</a></td>
-<td><a href="{$row.report}">Report</a></td>
+<td><a href="{$row.report}">{ts}Report{/ts}</a></td>
 </tr>
 {/foreach}
 </table>
diff --git a/templates/CRM/Member/Form/MembershipView.tpl b/templates/CRM/Member/Form/MembershipView.tpl
index f6b073d2ff..9038c1c422 100644
--- a/templates/CRM/Member/Form/MembershipView.tpl
+++ b/templates/CRM/Member/Form/MembershipView.tpl
@@ -55,7 +55,7 @@
           <tr>
             <td class="label">{ts}Recurring Contribution{/ts}</td>
             <td>
-              <a class="crm-hover-button action-item" href='{crmURL p="civicrm/contact/view/contributionrecur" q="reset=1&id=`$contribution_recur_id`&cid=`$contactId`&context=contribution"}'>View Recurring Contribution</a>
+              <a class="crm-hover-button action-item" href='{crmURL p="civicrm/contact/view/contributionrecur" q="reset=1&id=`$contribution_recur_id`&cid=`$contactId`&context=contribution"}'>{ts}View Recurring Contribution{/ts}</a>
             </td>
           </tr>
      {/if}
diff --git a/templates/CRM/UF/Form/AdvanceSetting.tpl b/templates/CRM/UF/Form/AdvanceSetting.tpl
index 4f274243c7..4ad7d6a6e1 100644
--- a/templates/CRM/UF/Form/AdvanceSetting.tpl
+++ b/templates/CRM/UF/Form/AdvanceSetting.tpl
@@ -9,7 +9,7 @@
 *}
 <div class="crm-accordion-wrapper collapsed">
  <div class="crm-accordion-header">
-    Advanced Settings
+    {ts}Advanced Settings{/ts}
   </div><!-- /.crm-accordion-header -->
   <div class="crm-accordion-body">
   <div class="crm-block crm-form-block crm-uf-advancesetting-form-block">
-- 
2.25.1