From 085927209f4221e1e3a03e23dfc96e99ce47b7f2 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Wed, 15 Jun 2022 22:56:12 -0700 Subject: [PATCH] (NFC) Domain Tokens - Use consistent capitalization (title-case) The current labels have mixed capitalization. Notwitstanding one notable exception (`{action.*}`), most tokens use title-case. So this patch applies title-case. --- CRM/Core/DomainTokens.php | 24 +++++++++---------- .../CRM/Utils/TokenConsistencyTest.php | 24 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/CRM/Core/DomainTokens.php b/CRM/Core/DomainTokens.php index 16b09e6f42..65b36e7d05 100644 --- a/CRM/Core/DomainTokens.php +++ b/CRM/Core/DomainTokens.php @@ -41,18 +41,18 @@ class CRM_Core_DomainTokens extends AbstractTokenSubscriber { public function getDomainTokens(): array { return [ - 'name' => ts('Domain name'), - 'address' => ts('Domain (organization) address'), - 'street_address' => ts('Domain (organization) street address'), - 'supplemental_address_1' => ts('Domain (organization) Supplemental Address'), - 'supplemental_address_2' => ts('Domain (organization) Supplemental Address 2'), - 'supplemental_address_3' => ts('Domain (organization) Supplemental Address 3'), - 'city' => ts('Domain (organization) City'), - 'postal_code' => ts('Domain (organization) Postal Code'), - 'state_province_id:label' => ts('Domain (organization) State'), - 'country_id:label' => ts('Domain (organization) Country'), - 'phone' => ts('Domain (organization) phone'), - 'email' => ts('Domain (organization) email'), + 'name' => ts('Domain Name'), + 'address' => ts('Domain (Organization) Full Address'), + 'street_address' => ts('Domain (Organization) Street Address'), + 'supplemental_address_1' => ts('Domain (Organization) Supplemental Address'), + 'supplemental_address_2' => ts('Domain (Organization) Supplemental Address 2'), + 'supplemental_address_3' => ts('Domain (Organization) Supplemental Address 3'), + 'city' => ts('Domain (Organization) City'), + 'postal_code' => ts('Domain (Organization) Postal Code'), + 'state_province_id:label' => ts('Domain (Organization) State'), + 'country_id:label' => ts('Domain (Organization) Country'), + 'phone' => ts('Domain (Organization) Phone'), + 'email' => ts('Domain (Organization) Email'), 'id' => ts('Domain ID'), 'description' => ts('Domain Description'), 'now' => ts('Current time/date'), diff --git a/tests/phpunit/CRM/Utils/TokenConsistencyTest.php b/tests/phpunit/CRM/Utils/TokenConsistencyTest.php index 51dcd0c7aa..4ce4a08752 100644 --- a/tests/phpunit/CRM/Utils/TokenConsistencyTest.php +++ b/tests/phpunit/CRM/Utils/TokenConsistencyTest.php @@ -791,22 +791,22 @@ United States', $tokenProcessor->getRow(0)->render('message')); */ public function getDomainTokens(): array { return [ - '{domain.name}' => ts('Domain name'), - '{domain.address}' => ts('Domain (organization) address'), - '{domain.phone}' => ts('Domain (organization) phone'), - '{domain.email}' => 'Domain (organization) email', + '{domain.name}' => ts('Domain Name'), + '{domain.address}' => ts('Domain (Organization) Full Address'), + '{domain.phone}' => ts('Domain (Organization) Phone'), + '{domain.email}' => 'Domain (Organization) Email', '{domain.id}' => ts('Domain ID'), '{domain.description}' => ts('Domain Description'), '{domain.now}' => 'Current time/date', '{domain.tax_term}' => 'Sales tax term (e.g VAT)', - '{domain.street_address}' => 'Domain (organization) street address', - '{domain.supplemental_address_1}' => 'Domain (organization) Supplemental Address', - '{domain.supplemental_address_2}' => 'Domain (organization) Supplemental Address 2', - '{domain.supplemental_address_3}' => 'Domain (organization) Supplemental Address 3', - '{domain.city}' => 'Domain (organization) City', - '{domain.postal_code}' => 'Domain (organization) Postal Code', - '{domain.state_province_id:label}' => 'Domain (organization) State', - '{domain.country_id:label}' => 'Domain (organization) Country', + '{domain.street_address}' => 'Domain (Organization) Street Address', + '{domain.supplemental_address_1}' => 'Domain (Organization) Supplemental Address', + '{domain.supplemental_address_2}' => 'Domain (Organization) Supplemental Address 2', + '{domain.supplemental_address_3}' => 'Domain (Organization) Supplemental Address 3', + '{domain.city}' => 'Domain (Organization) City', + '{domain.postal_code}' => 'Domain (Organization) Postal Code', + '{domain.state_province_id:label}' => 'Domain (Organization) State', + '{domain.country_id:label}' => 'Domain (Organization) Country', ]; } -- 2.25.1