From: Coleman Watts Date: Thu, 30 Jul 2015 19:28:50 +0000 (-0400) Subject: CRM-14078 - More consistent contact field labels X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d79be26c2cea20c99337e0dc9c1be51c2086e41c;p=civicrm-core.git CRM-14078 - More consistent contact field labels --- diff --git a/CRM/Activity/Import/Parser/Activity.php b/CRM/Activity/Import/Parser/Activity.php index 778d0b322e..fdbcd75240 100644 --- a/CRM/Activity/Import/Parser/Activity.php +++ b/CRM/Activity/Import/Parser/Activity.php @@ -373,14 +373,14 @@ class CRM_Activity_Import_Parser_Activity extends CRM_Activity_Import_Parser { if (!empty($params['target_contact_id']) && $params['target_contact_id'] != $targetContactId ) { - array_unshift($values, 'Mismatch of External identifier :' . $params['external_identifier'] . ' and Contact Id:' . $params['target_contact_id']); + array_unshift($values, 'Mismatch of External ID:' . $params['external_identifier'] . ' and Contact Id:' . $params['target_contact_id']); return CRM_Import_Parser::ERROR; } elseif ($targetContactId) { $params['target_contact_id'] = $targetContactId; } else { - array_unshift($values, 'No Matching Contact for External identifier :' . $params['external_identifier']); + array_unshift($values, 'No Matching Contact for External ID:' . $params['external_identifier']); return CRM_Import_Parser::ERROR; } } diff --git a/CRM/Campaign/BAO/Query.php b/CRM/Campaign/BAO/Query.php index a6e7b2f090..390be8d5c7 100755 --- a/CRM/Campaign/BAO/Query.php +++ b/CRM/Campaign/BAO/Query.php @@ -354,7 +354,7 @@ civicrm_activity_assignment.record_type_id = $assigneeID ) "; $form->add('text', 'street_unit', ts('Street Unit'), $attributes['street_unit']); $form->add('text', 'street_address', ts('Street Address'), $attributes['street_address']); $form->add('text', 'city', ts('City'), $attributes['city']); - $form->add('text', 'postal_code', ts('Zip / Postal Code'), $attributes['postal_code']); + $form->add('text', 'postal_code', ts('Postal Code'), $attributes['postal_code']); //@todo FIXME - using the CRM_Core_DAO::VALUE_SEPARATOR creates invalid html - if you can find the form // this is loaded onto then replace with something like '__' & test diff --git a/CRM/Contact/Form/Edit/Address.php b/CRM/Contact/Form/Edit/Address.php index b6cdd6b7f9..35d2ed39c0 100644 --- a/CRM/Contact/Form/Edit/Address.php +++ b/CRM/Contact/Form/Edit/Address.php @@ -142,7 +142,13 @@ class CRM_Contact_Form_Edit_Address { $name = 'name'; } - $form->addField("address[$blockId][$name]", array('entity' => 'address')); + $params = array('entity' => 'address'); + + if ($name == 'postal_code_suffix') { + $params['label'] = ts('Suffix'); + } + + $form->addField("address[$blockId][$name]", $params); } $entityId = NULL; diff --git a/CRM/Contact/Form/Search/Criteria.php b/CRM/Contact/Form/Search/Criteria.php index 593e98e785..a73122e082 100644 --- a/CRM/Contact/Form/Search/Criteria.php +++ b/CRM/Contact/Form/Search/Criteria.php @@ -270,7 +270,7 @@ class CRM_Contact_Form_Search_Criteria { $form->addSelect('preferred_language', array('class' => 'twenty', 'context' => 'search')); // Phone search - $form->addElement('text', 'phone_numeric', ts('Phone Number'), CRM_Core_DAO::getAttribute('CRM_Core_DAO_Phone', 'phone')); + $form->addElement('text', 'phone_numeric', ts('Phone'), CRM_Core_DAO::getAttribute('CRM_Core_DAO_Phone', 'phone')); $locationType = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Address', 'location_type_id'); $phoneType = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Phone', 'phone_type_id'); $form->add('select', 'phone_location_type_id', ts('Phone Location'), array('' => ts('- any -')) + $locationType, FALSE, array('class' => 'crm-select2')); @@ -302,7 +302,7 @@ class CRM_Contact_Form_Search_Criteria { $elements = array( 'street_address' => array(ts('Street Address'), $attributes['street_address'], NULL, NULL), 'city' => array(ts('City'), $attributes['city'], NULL, NULL), - 'postal_code' => array(ts('Zip / Postal Code'), $attributes['postal_code'], NULL, NULL), + 'postal_code' => array(ts('Postal Code'), $attributes['postal_code'], NULL, NULL), 'country' => array(ts('Country'), $attributes['country_id'], 'country', FALSE), 'state_province' => array(ts('State/Province'), $attributes['state_province_id'], 'stateProvince', TRUE), 'county' => array(ts('County'), $attributes['county_id'], 'county', TRUE), diff --git a/CRM/Contribute/Import/Parser/Contribution.php b/CRM/Contribute/Import/Parser/Contribution.php index ea4f96640a..42514f6f61 100644 --- a/CRM/Contribute/Import/Parser/Contribution.php +++ b/CRM/Contribute/Import/Parser/Contribution.php @@ -540,7 +540,7 @@ class CRM_Contribute_Import_Parser_Contribution extends CRM_Contribute_Import_Pa $checkCid->external_identifier = $paramValues['external_identifier']; $checkCid->find(TRUE); if ($checkCid->id != $formatted['contact_id']) { - array_unshift($values, 'Mismatch of External identifier :' . $paramValues['external_identifier'] . ' and Contact Id:' . $formatted['contact_id']); + array_unshift($values, 'Mismatch of External ID:' . $paramValues['external_identifier'] . ' and Contact Id:' . $formatted['contact_id']); return CRM_Import_Parser::ERROR; } } diff --git a/CRM/Event/Import/Parser/Participant.php b/CRM/Event/Import/Parser/Participant.php index 8d72d37ddc..02fdeb1bde 100644 --- a/CRM/Event/Import/Parser/Participant.php +++ b/CRM/Event/Import/Parser/Participant.php @@ -453,7 +453,7 @@ class CRM_Event_Import_Parser_Participant extends CRM_Event_Import_Parser { $checkCid->external_identifier = $formatValues['external_identifier']; $checkCid->find(TRUE); if ($checkCid->id != $formatted['contact_id']) { - array_unshift($values, 'Mismatch of External identifier :' . $formatValues['external_identifier'] . ' and Contact Id:' . $formatted['contact_id']); + array_unshift($values, 'Mismatch of External ID:' . $formatValues['external_identifier'] . ' and Contact Id:' . $formatted['contact_id']); return CRM_Import_Parser::ERROR; } } diff --git a/CRM/Member/Import/Parser/Membership.php b/CRM/Member/Import/Parser/Membership.php index 303d7800e3..7a69be4cbd 100644 --- a/CRM/Member/Import/Parser/Membership.php +++ b/CRM/Member/Import/Parser/Membership.php @@ -516,7 +516,7 @@ class CRM_Member_Import_Parser_Membership extends CRM_Member_Import_Parser { $checkCid->external_identifier = $formatValues['external_identifier']; $checkCid->find(TRUE); if ($checkCid->id != $formatted['contact_id']) { - array_unshift($values, 'Mismatch of External identifier :' . $formatValues['external_identifier'] . ' and Contact Id:' . $formatted['contact_id']); + array_unshift($values, 'Mismatch of External ID:' . $formatValues['external_identifier'] . ' and Contact Id:' . $formatted['contact_id']); return CRM_Import_Parser::ERROR; } } diff --git a/api/v3/examples/Contact/GetFieldsOptions.php b/api/v3/examples/Contact/GetFieldsOptions.php index d45717fe37..61aa1b8bb0 100644 --- a/api/v3/examples/Contact/GetFieldsOptions.php +++ b/api/v3/examples/Contact/GetFieldsOptions.php @@ -689,7 +689,7 @@ function contact_getfields_expectedresult() { 'source' => array( 'name' => 'source', 'type' => 2, - 'title' => 'Source of Contact Data', + 'title' => 'Contact Source', 'maxlength' => 255, 'size' => 30, 'import' => TRUE, diff --git a/api/v3/examples/Mailing/GetTokens.php b/api/v3/examples/Mailing/GetTokens.php index 8e100bedf1..6ef6552673 100644 --- a/api/v3/examples/Mailing/GetTokens.php +++ b/api/v3/examples/Mailing/GetTokens.php @@ -79,7 +79,7 @@ function mailing_gettokens_expectedresult() { '{contact.preferred_language}' => 'Preferred Language', '{contact.preferred_mail_format}' => 'Preferred Mail Format', '{contact.hash}' => 'Contact Hash', - '{contact.contact_source}' => 'Source of Contact Data', + '{contact.contact_source}' => 'Contact Source', '{contact.first_name}' => 'First Name', '{contact.middle_name}' => 'Middle Name', '{contact.last_name}' => 'Last Name', diff --git a/templates/CRM/Contact/Form/Contact.hlp b/templates/CRM/Contact/Form/Contact.hlp index 36a9de2b35..7900a80428 100644 --- a/templates/CRM/Contact/Form/Contact.hlp +++ b/templates/CRM/Contact/Form/Contact.hlp @@ -129,7 +129,7 @@ {/htxt} {htxt id="id-internal-id-title"} - {ts}CiviCRM ID{/ts} + {ts}Contact ID{/ts} {/htxt} {htxt id="id-internal-id"}

{ts}Every contact in CiviCRM has a unique ID number. This number will never change and is the most accurate way of identifying a contact.{/ts}

diff --git a/templates/CRM/Contact/Form/Contact.tpl b/templates/CRM/Contact/Form/Contact.tpl index aa4eebce90..af546cae23 100644 --- a/templates/CRM/Contact/Form/Contact.tpl +++ b/templates/CRM/Contact/Form/Contact.tpl @@ -63,7 +63,7 @@ {if $contactId} -
+
{/if} diff --git a/templates/CRM/Contact/Form/Edit/Address/city_postal_code.tpl b/templates/CRM/Contact/Form/Edit/Address/city_postal_code.tpl index d30647c855..50aad025b7 100644 --- a/templates/CRM/Contact/Form/Edit/Address/city_postal_code.tpl +++ b/templates/CRM/Contact/Form/Edit/Address/city_postal_code.tpl @@ -35,14 +35,14 @@ {if !empty($form.address.$blockId.postal_code)} {$form.address.$blockId.postal_code.label}
- {$form.address.$blockId.postal_code.html}   - {if !empty($form.address.$blockId.postal_code_suffix)} + {$form.address.$blockId.postal_code.html} + + {if !empty($form.address.$blockId.postal_code_suffix)} - {$form.address.$blockId.postal_code_suffix.label}
- {$form.address.$blockId.postal_code_suffix.html} {help id="id-postal-code-suffix" file="CRM/Contact/Form/Contact.hlp"} + {$form.address.$blockId.postal_code_suffix.label} {help id="id-postal-code-suffix" file="CRM/Contact/Form/Contact.hlp"}
+ {$form.address.$blockId.postal_code_suffix.html} - {/if} - + {/if} {/if}    diff --git a/templates/CRM/Contact/Page/View/Summary.tpl b/templates/CRM/Contact/Page/View/Summary.tpl index 255403d894..587cef2926 100644 --- a/templates/CRM/Contact/Page/View/Summary.tpl +++ b/templates/CRM/Contact/Page/View/Summary.tpl @@ -185,7 +185,7 @@
- {ts}CiviCRM ID{/ts}{if !empty($userRecordUrl)} / {ts}User ID{/ts}{/if} + {ts}Contact ID{/ts}{if !empty($userRecordUrl)} / {ts}User ID{/ts}{/if}
{$contactId} diff --git a/templates/CRM/Custom/Import/Form/DataSource.hlp b/templates/CRM/Custom/Import/Form/DataSource.hlp index 3a4bf9d472..e8b7fb9fdf 100644 --- a/templates/CRM/Custom/Import/Form/DataSource.hlp +++ b/templates/CRM/Custom/Import/Form/DataSource.hlp @@ -27,6 +27,6 @@ {ts}Importing Multi-value Custom Data{/ts} {/htxt} {htxt id="upload"} - {ts}The import file should contain a row for each set of custom data fields. For example, if you are importing employment history for a group of contacts, each row might contain columns for Employer, Start Date, End Date, and Position. You will also need a column containing the CiviCRM Internal Contact ID which is used to match each row to the corresponding (existing) CiviCRM contact record. NOTE: Contact IDs are included by default when exporting contacts from CiviCRM.{/ts} + {ts}The import file should contain a row for each set of custom data fields. For example, if you are importing employment history for a group of contacts, each row might contain columns for Employer, Start Date, End Date, and Position. You will also need a column containing the CiviCRM Contact ID which is used to match each row to the corresponding (existing) CiviCRM contact record. NOTE: Contact IDs are included by default when exporting contacts from CiviCRM.{/ts} {/htxt} diff --git a/templates/CRM/common/contactFooter.tpl b/templates/CRM/common/contactFooter.tpl index 402f128dc5..2873c8718a 100644 --- a/templates/CRM/common/contactFooter.tpl +++ b/templates/CRM/common/contactFooter.tpl @@ -28,7 +28,7 @@