From 7e4d3353be0442b582cdb0cea2aec17a56a202b1 Mon Sep 17 00:00:00 2001 From: Luke Stewart Date: Wed, 24 May 2023 10:22:22 +1200 Subject: [PATCH] Refs: dev/core#4305 Bulk update of href to ng-href where href value contains '{{' This was performed using the following: grep -n -R -o -E -e ']*\shref="[^"]*\{\{[^"]*"' -e "]*\shref='[^']*\{\{[^']*'" . | awk -F : '{print "sed -i #"$2"s/href/ng-href/g# "$1}' | tr '#' "'" > updates.sh Then running the generated script. This commit excludes a file in tests which I'll add as a separate commit. --- ang/crmCaseType/edit.html | 2 +- ang/crmUi/tabset.html | 2 +- ext/afform/admin/ang/afAdmin/afAdminList.html | 8 ++++---- ext/afform/admin/ang/afGuiEditor/afGuiEditorCanvas.html | 2 +- .../ang/afGuiEditor/elements/afGuiSearchDisplay.html | 2 +- .../ang/afsearchAdminFinancialTypes.aff.html | 4 ++-- .../ang/afsearchFinancialAccounts.aff.html | 6 +++--- .../ang/crmSearchAdmin/searchListing/afforms.html | 4 ++-- .../ang/crmSearchAdmin/searchListing/buttons.html | 2 +- ext/search_kit/ang/crmSearchDisplay/colType/buttons.html | 2 +- ext/search_kit/ang/crmSearchDisplay/colType/field.html | 2 +- ext/search_kit/ang/crmSearchDisplay/colType/image.html | 2 +- ext/search_kit/ang/crmSearchDisplay/colType/links.html | 2 +- ext/search_kit/ang/crmSearchDisplay/colType/menu.html | 2 +- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ang/crmCaseType/edit.html b/ang/crmCaseType/edit.html index 47e3f3c13f..d4969d04bc 100644 --- a/ang/crmCaseType/edit.html +++ b/ang/crmCaseType/edit.html @@ -19,7 +19,7 @@ Required vars: caseType
  • {{:: ts('Case Statuses') }}
  • {{:: ts('Activity Types') }}
  • - +
    {{ activitySet.label }}
    diff --git a/ang/crmUi/tabset.html b/ang/crmUi/tabset.html index d348197e10..6030d47f02 100644 --- a/ang/crmUi/tabset.html +++ b/ang/crmUi/tabset.html @@ -1,7 +1,7 @@
    - + {{:: ts('View Page') }} diff --git a/ext/afform/admin/ang/afGuiEditor/elements/afGuiSearchDisplay.html b/ext/afform/admin/ang/afGuiEditor/elements/afGuiSearchDisplay.html index 90b5fdeede..87d814a11f 100644 --- a/ext/afform/admin/ang/afGuiEditor/elements/afGuiSearchDisplay.html +++ b/ext/afform/admin/ang/afGuiEditor/elements/afGuiSearchDisplay.html @@ -7,7 +7,7 @@
    • - + {{:: ts('Edit Saved Search') }}
      • diff --git a/ext/civicrm_admin_ui/ang/afsearchAdminFinancialTypes.aff.html b/ext/civicrm_admin_ui/ang/afsearchAdminFinancialTypes.aff.html index 0b0ab455f9..8adf6a99d8 100644 --- a/ext/civicrm_admin_ui/ang/afsearchAdminFinancialTypes.aff.html +++ b/ext/civicrm_admin_ui/ang/afsearchAdminFinancialTypes.aff.html @@ -4,11 +4,11 @@

      {{:: ts('Financial types are used to categorize contributions for reporting and accounting purposes. You may set up as many as needed, including commonly used types such as Donation, Campaign Contribution or Membership Dues.') }} {{:: ts('Additionally, financial types can account for the inventory and expense of premiums.') }} - {{:: ts('View Premiums') }} + {{:: ts('View Premiums') }}

      {{:: ts('Each financial type relates to a number of financial accounts to track income, accounts receivable, and fees.') }} - {{:: ts('View Financial Accounts') }} + {{:: ts('View Financial Accounts') }}

    diff --git a/ext/civicrm_admin_ui/ang/afsearchFinancialAccounts.aff.html b/ext/civicrm_admin_ui/ang/afsearchFinancialAccounts.aff.html index 242140f770..5f6e4922e1 100644 --- a/ext/civicrm_admin_ui/ang/afsearchFinancialAccounts.aff.html +++ b/ext/civicrm_admin_ui/ang/afsearchFinancialAccounts.aff.html @@ -3,10 +3,10 @@
    {{:: ts('Financial accounts correspond to those in your accounting system.') }} {{:: ts('The following are associated with financial accounts so that they can result in the proper double-entry transactions to export to your accounting system:') }} - {{:: ts('Financial types') }}, - {{:: ts('payment methods') }}, + {{:: ts('Financial types') }}, + {{:: ts('payment methods') }}, {{:: ts('and') }} - {{:: ts('contribution premiums.') }} + {{:: ts('contribution premiums.') }}
    diff --git a/ext/search_kit/ang/crmSearchAdmin/searchListing/afforms.html b/ext/search_kit/ang/crmSearchAdmin/searchListing/afforms.html index 9912d36d5c..a1fccf16b4 100644 --- a/ext/search_kit/ang/crmSearchAdmin/searchListing/afforms.html +++ b/ext/search_kit/ang/crmSearchAdmin/searchListing/afforms.html @@ -5,12 +5,12 @@
    • - + {{:: ts('Create form for search results table') }}
    • - + {{:: ts('Create form for %1', {1: row.data.display_label[$index]}) }}
      • diff --git a/ext/search_kit/ang/crmSearchAdmin/searchListing/buttons.html b/ext/search_kit/ang/crmSearchAdmin/searchListing/buttons.html index 2499a9f9c8..bcc11e87bc 100644 --- a/ext/search_kit/ang/crmSearchAdmin/searchListing/buttons.html +++ b/ext/search_kit/ang/crmSearchAdmin/searchListing/buttons.html @@ -1,5 +1,5 @@
      - + {{:: ts('Edit') }} diff --git a/ext/search_kit/ang/crmSearchDisplay/colType/buttons.html b/ext/search_kit/ang/crmSearchDisplay/colType/buttons.html index 970ff34489..4bf5f1b7c4 100644 --- a/ext/search_kit/ang/crmSearchDisplay/colType/buttons.html +++ b/ext/search_kit/ang/crmSearchDisplay/colType/buttons.html @@ -1,5 +1,5 @@ - + {{:: link.text }} diff --git a/ext/search_kit/ang/crmSearchDisplay/colType/field.html b/ext/search_kit/ang/crmSearchDisplay/colType/field.html index 77ca4faf20..0877b15aaa 100644 --- a/ext/search_kit/ang/crmSearchDisplay/colType/field.html +++ b/ext/search_kit/ang/crmSearchDisplay/colType/field.html @@ -6,7 +6,7 @@ - + {{:: link.text }}, diff --git a/ext/search_kit/ang/crmSearchDisplay/colType/image.html b/ext/search_kit/ang/crmSearchDisplay/colType/image.html index c76036340d..c7d12feb48 100644 --- a/ext/search_kit/ang/crmSearchDisplay/colType/image.html +++ b/ext/search_kit/ang/crmSearchDisplay/colType/image.html @@ -1,6 +1,6 @@ - + {{:: colData.val }} diff --git a/ext/search_kit/ang/crmSearchDisplay/colType/links.html b/ext/search_kit/ang/crmSearchDisplay/colType/links.html index c9e8af5a28..0854f6f477 100644 --- a/ext/search_kit/ang/crmSearchDisplay/colType/links.html +++ b/ext/search_kit/ang/crmSearchDisplay/colType/links.html @@ -1,5 +1,5 @@ - + {{:: link.text }} diff --git a/ext/search_kit/ang/crmSearchDisplay/colType/menu.html b/ext/search_kit/ang/crmSearchDisplay/colType/menu.html index d84d3c774f..5e6556f875 100644 --- a/ext/search_kit/ang/crmSearchDisplay/colType/menu.html +++ b/ext/search_kit/ang/crmSearchDisplay/colType/menu.html @@ -5,7 +5,7 @@