From 0ffad7aa75d3713ddf539ace8285ca4e66ae12ee Mon Sep 17 00:00:00 2001 From: Bradley Taylor Date: Sat, 23 Oct 2021 12:09:44 +0100 Subject: [PATCH] Miscellaneous spelling fixes --- api/v3/Cxn.php | 2 +- templates/CRM/Admin/Page/MessageTemplates.hlp | 2 +- templates/CRM/Contact/Form/Task/Email.hlp | 2 +- templates/CRM/Contribute/Form/ContributionPage/Custom.hlp | 4 ++-- templates/CRM/Contribute/Import/Form/DataSource.hlp | 2 +- templates/CRM/UF/Form/Group.hlp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api/v3/Cxn.php b/api/v3/Cxn.php index 072479e763..3ad6508c98 100644 --- a/api/v3/Cxn.php +++ b/api/v3/Cxn.php @@ -46,7 +46,7 @@ function _civicrm_api3_cxn_register_spec(&$spec) { * * @param array $params * Array with keys: - * - app_guid: The unique identifer of the target application. + * - app_guid: The unique identifier of the target application. * - app_meta_url: The URL for the application's metadata. * @return array * @throws Exception diff --git a/templates/CRM/Admin/Page/MessageTemplates.hlp b/templates/CRM/Admin/Page/MessageTemplates.hlp index dce28aeeaf..a67f40f9f7 100644 --- a/templates/CRM/Admin/Page/MessageTemplates.hlp +++ b/templates/CRM/Admin/Page/MessageTemplates.hlp @@ -30,7 +30,7 @@ {/htxt} {htxt id="id-system-workflow"}

- {ts}System workflow message templates are used to generate the emails sent to consituents and administrators for contribution receipts, event confirmations and many other workflows. You can customize the style and wording of these messages here.{/ts} + {ts}System workflow message templates are used to generate the emails sent to constituents and administrators for contribution receipts, event confirmations and many other workflows. You can customize the style and wording of these messages here.{/ts}

{ts}Workflow messages include text AND necessary program logic. Use caution when editing so as not to modify the program logic. Be sure to test the workflow and review the emails sent after making any changes. If you find that your changes have caused problems, errors or missing information - you can always "Revert" to the system default for that workflow.{/ts} diff --git a/templates/CRM/Contact/Form/Task/Email.hlp b/templates/CRM/Contact/Form/Task/Email.hlp index 8fec104b60..9ae2dcb3df 100644 --- a/templates/CRM/Contact/Form/Task/Email.hlp +++ b/templates/CRM/Contact/Form/Task/Email.hlp @@ -15,7 +15,7 @@ {if !empty($params.logged_in_email_setting) and $params.logged_in_email_setting == "1"}

{ts}By default, CiviCRM uses the primary email address of the logged in user as the FROM address when sending emails to contacts. However, users with Administer CiviCRM permission can configure one or more general email addresses that can be selected as an alternative. EXAMPLE: "Client Services" <clientservices@example.org>{/ts}

{else} -

{ts}CiviCRM is currently configured to only use the defined From Email addresses. If you wish to be able to use the email address of the logged in user as the From Address you will need to set the setting "Allow mail from loged in contact" setting. Users with Administer CiviCRM can set this setting in the SMTP settings.{/ts}

+

{ts}CiviCRM is currently configured to only use the defined From Email addresses. If you wish to be able to use the email address of the logged in user as the From Address you will need to set the setting "Allow mail from logged in contact" setting. Users with Administer CiviCRM can set this setting in the SMTP settings.{/ts}

{if !empty($params.isAdmin)} {capture assign="smtpUrl"}{crmURL p="civicrm/admin/setting/smtp" q="reset=1"}{/capture}

{ts 1=$smtpUrl}Go to Settings - Outbound Mail to enable the usage of the logged in contact's email address as the from email{/ts}

diff --git a/templates/CRM/Contribute/Form/ContributionPage/Custom.hlp b/templates/CRM/Contribute/Form/ContributionPage/Custom.hlp index 8e6545889c..92683f5f53 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Custom.hlp +++ b/templates/CRM/Contribute/Form/ContributionPage/Custom.hlp @@ -19,10 +19,10 @@ {ts}If you haven't already configured custom fields and a profile to collect data you need for this form, you can create them here using the steps below.{/ts}

    -
  1. {ts}Create a new profile by clicking the 'Create' button next to 'Include Profile' field below. Name your new profile (e.g. 'Contribution Information').{/ts}
    2. +
  2. {ts}Create a new profile by clicking the 'Create' button next to the 'Include Profile' field. Name your new profile (e.g. 'Contribution Information').{/ts}
  3. {ts}Add any existing fields needed by dragging them into the profile form builder.{/ts}
  4. {ts}If you need to create new custom fields, you can also do that within the profile editor. Then add the new custom field(s) to this profile by dragging them into the form builder.{/ts}
    5. -
  5. {ts}Save your profile to return to this screen. You can preview it from here by clicking the Preview (microsope) button.{/ts}
    6. +
  6. {ts}Save your profile to return to this screen. You can preview it from here by clicking the Preview button.{/ts}
{capture assign=docLinkCustom}{docURL page="user/organising-your-data/custom-fields" text="custom fields"}{/capture} {capture assign=docLinkProfile}{docURL page="user/organising-your-data/profiles" text="profiles"}{/capture} diff --git a/templates/CRM/Contribute/Import/Form/DataSource.hlp b/templates/CRM/Contribute/Import/Form/DataSource.hlp index 404f9b7bea..d63dd0b0b8 100644 --- a/templates/CRM/Contribute/Import/Form/DataSource.hlp +++ b/templates/CRM/Contribute/Import/Form/DataSource.hlp @@ -30,5 +30,5 @@ {htxt id="id-onDuplicate"}

{ts}For each import, you can either INSERT new contribution records, or UPDATE existing records. You can not do both types of operations in a single import session.{/ts}

{ts}If you are INSERTING new contributions, you will need to include a column in your data file containing the values used to link the contribution to an existing contact. You can use the 'Internal Contact ID', an 'External Identifier' (if you are using those in your contact records), OR the property defined in your Unsupervised Duplicate Matching rule (which is Email Address by default).{/ts}

-

{ts}If you are UPDATING existing contributions, you will need to include a unique identifer to match to the existing contribution record. This can be either the CiviCRM-assigned contribution ID, a unique Invoice ID, or a unique Transaction ID.{/ts}

+

{ts}If you are UPDATING existing contributions, you will need to include a unique identifier to match to the existing contribution record. This can be either the CiviCRM-assigned contribution ID, a unique Invoice ID, or a unique Transaction ID.{/ts}

{/htxt} diff --git a/templates/CRM/UF/Form/Group.hlp b/templates/CRM/UF/Form/Group.hlp index 7142292f7e..fdb674fa81 100644 --- a/templates/CRM/UF/Form/Group.hlp +++ b/templates/CRM/UF/Form/Group.hlp @@ -127,7 +127,7 @@ {htxt id='id-is_cms_user'} {ts 1=`$config->userFramework`}If you are using this profile as a contact signup form, using it in an online contribution page OR an event registration page, anonymous users will be given the option to create a %1 User Account as part of completing the form.{/ts} {if $config->userSystem->is_drupal EQ '1'} - {ts}This feature requires your Drupal User Settings to allow 'vistors to create accounts' (with or without administrator approval). The 'Email Verification' option may be enabled or disabled.{/ts} + {ts}This feature requires your Drupal User Settings to allow 'visitors to create accounts' (with or without administrator approval). The 'Email Verification' option may be enabled or disabled.{/ts} {ts}If the 'Email Verification' option is enabled, users will receive a welcome email from Drupal with login information. Otherwise they will select a Password inline, and if administrator approval is not required they will be automatically logged in as soon as the transaction is completed.{/ts} {elseif $config->userFramework EQ 'Joomla'} {ts}This feature requires the 'Allow User Registration' setting to be 'Yes' in Joomla Global Configuration >> System Settings.{/ts} -- 2.25.1