Commit 757069de authored by colemanw's avatar colemanw

Cleanup inconsistent labelling - 'State/Province' vs 'State / Province'

parent 2ced205b
......@@ -114,7 +114,7 @@ class CRM_Contact_Form_Edit_Address {
'postal_code' => array(ts('Zip / Postal Code'), array_merge($attributes['postal_code'], array('class' => 'crm_postal_code')), NULL),
'postal_code_suffix' => array(ts('Postal Code Suffix'), array('size' => 4, 'maxlength' => 12, 'class' => 'crm_postal_code_suffix'), NULL),
'country_id' => array(ts('Country'), $attributes['country_id'], 'country'),
'state_province_id' => array(ts('State / Province'), $attributes['state_province_id'], NULL),
'state_province_id' => array(ts('State/Province'), $attributes['state_province_id'], NULL),
'county_id' => array(ts('County'), $attributes['county_id'], NULL),
'geo_code_1' => array(ts('Latitude'), array('size' => 9, 'maxlength' => 11), NULL),
'geo_code_2' => array(ts('Longitude'), array('size' => 9, 'maxlength' => 11), NULL),
......
......@@ -296,7 +296,7 @@ class CRM_Contact_Form_Search_Criteria {
'city' => array(ts('City'), $attributes['city'], NULL, NULL),
'postal_code' => array(ts('Zip / 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),
'state_province' => array(ts('State/Province'), $attributes['state_province_id'], 'stateProvince', TRUE),
'county' => array(ts('County'), $attributes['county_id'], 'county', TRUE),
'address_name' => array(ts('Address Name'), $attributes['address_name'], NULL, NULL),
'street_number' => array(ts('Street Number'), $attributes['street_number'], NULL, NULL),
......
......@@ -1405,7 +1405,7 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Contact_Import_Parser {
continue;
}
else {
self::addToErrorMsg(ts('State / Province'), $errorMessage);
self::addToErrorMsg(ts('State/Province'), $errorMessage);
}
}
}
......
......@@ -1736,7 +1736,7 @@ class CRM_Core_Form extends HTML_QuickForm_Page {
$props = $settings += array(
'control_field' => str_replace(array('state_province', 'StateProvince', 'county', 'County'), array('country', 'Country', 'state_province', 'StateProvince'), $elementName),
'data-callback' => strpos($elementName, 'rovince') ? 'civicrm/ajax/jqState' : 'civicrm/ajax/jqCounty',
'label' => strpos($elementName, 'rovince') ? ts('State / Province') : ts('County'),
'label' => strpos($elementName, 'rovince') ? ts('State/Province') : ts('County'),
'data-empty-prompt' => strpos($elementName, 'rovince') ? ts('Choose country first') : ts('Choose state first'),
'data-none-prompt' => ts('- N/A -'),
'multiple' => FALSE,
......
......@@ -107,7 +107,7 @@ class CRM_Core_Payment_Form {
$form->_paymentFields["billing_state_province_id-{$bltID}"] = array(
'htmlType' => 'chainSelect',
'title' => ts('State / Province'),
'title' => ts('State/Province'),
'name' => "billing_state_province_id-{$bltID}",
'cc_field' => TRUE,
'is_required' => TRUE,
......
......@@ -136,7 +136,7 @@ class CRM_Report_Form_Case_Demographics extends CRM_Report_Form {
'options' => CRM_Core_PseudoConstant::country( ),
),
'state_province_id' =>
array( 'title' => ts( 'State / Province' ),
array( 'title' => ts( 'State/Province' ),
'operatorType' => CRM_Report_Form::OP_MULTISELECT,
'options' => CRM_Core_PseudoConstant::stateProvince( ), ),
),
......
......@@ -39,7 +39,7 @@ VALUES
( @uf_group_id_onBehalfOrganization, 'country', 1, 0, 7, 'User and User Admin Only', 0, 0, @maxId,
{localize}'Country'{/localize}, 'Contact', {localize}NULL{/localize}, NULL ),
( @uf_group_id_onBehalfOrganization, 'state_province', 1, 0, 8, 'User and User Admin Only', 0, 0, @maxId,
{localize}'State / Province'{/localize}, 'Contact', {localize}NULL{/localize}, NULL );
{localize}'State/Province'{/localize}, 'Contact', {localize}NULL{/localize}, NULL );
-- CRM-8150
CREATE TABLE IF NOT EXISTS `civicrm_action_mapping` (
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -112,7 +112,7 @@
<tr class="crm-localization-form-block-provinceLimit">
<td class="label">{$form.provinceLimit.label}</td>
<td>{$form.provinceLimit.html}<br />
<span class="description">{ts}State/province listings are populated dynamically based on the selected Country for all standard contact address editing forms, as well as for <strong>Profile forms which include both a Country and a State/Province field</strong>. This setting controls which countries' states and/or provinces are available in the State / Province selection field <strong>for Custom Fields</strong> or for Profile forms which do NOT include a Country field.{/ts}</span></td>
<span class="description">{ts}State/province listings are populated dynamically based on the selected Country for all standard contact address editing forms, as well as for <strong>Profile forms which include both a Country and a State/Province field</strong>. This setting controls which countries' states and/or provinces are available in the State/Province selection field <strong>for Custom Fields</strong> or for Profile forms which do NOT include a Country field.{/ts}</span></td>
</tr>
</table>
<h3>{ts}Multiple Languages Support{/ts}</h3>
......
......@@ -228,7 +228,7 @@ class WebTest_Generic_GeneralClickAroundTest extends CiviSeleniumTestCase {
$this->assertTextPresent("Contact Name");
$this->assertTextPresent("Contact Source");
$this->assertTextPresent("Country");
$this->assertTextPresent("State / Province");
$this->assertTextPresent("State/Province");
$this->assertTextPresent("Group");
$this->assertTextPresent("Tag");
$this->click("_qf_Summary_submit");
......
......@@ -39,7 +39,7 @@
<name>state_province_id</name>
<type>int unsigned</type>
<required>true</required>
<comment>ID of State / Province that County belongs</comment>
<comment>ID of State/Province that County belongs</comment>
<add>1.1</add>
</field>
<foreignKey>
......
......@@ -9,7 +9,7 @@
<name>id</name>
<type>int unsigned</type>
<required>true</required>
<comment>State / Province ID</comment>
<comment>State/Province ID</comment>
<add>1.1</add>
</field>
<primaryKey>
......@@ -24,7 +24,7 @@
<import>true</import>
<headerPattern>/state|prov(ince)?/i</headerPattern>
<dataPattern>/[A-Z]{2}/</dataPattern>
<comment>Name of State / Province</comment>
<comment>Name of State/Province</comment>
<add>1.1</add>
</field>
<field>
......@@ -32,14 +32,14 @@
<title>State Abbreviation</title>
<type>varchar</type>
<length>4</length>
<comment>2-4 Character Abbreviation of State / Province</comment>
<comment>2-4 Character Abbreviation of State/Province</comment>
<add>1.1</add>
</field>
<field>
<name>country_id</name>
<type>int unsigned</type>
<required>true</required>
<comment>ID of Country that State / Province belong</comment>
<comment>ID of Country that State/Province belong</comment>
<add>1.1</add>
</field>
<foreignKey>
......
......@@ -533,7 +533,7 @@ VALUES
(@option_group_id_adOpt, '{ts escape="sql"}Zip / Postal Code{/ts}' , 5, 'postal_code' , NULL, 0, NULL, 5, NULL, 0, 0, 1, NULL, NULL),
(@option_group_id_adOpt, '{ts escape="sql"}Postal Code Suffix{/ts}', 6, 'postal_code_suffix', NULL, 0, NULL, 6, NULL, 0, 0, 1, NULL, NULL),
(@option_group_id_adOpt, '{ts escape="sql"}County{/ts}' , 7, 'county' , NULL, 0, NULL, 7, NULL, 0, 0, 1, NULL, NULL),
(@option_group_id_adOpt, '{ts escape="sql"}State / Province{/ts}' , 8, 'state_province', NULL, 0, NULL, 8, NULL, 0, 0, 1, NULL, NULL),
(@option_group_id_adOpt, '{ts escape="sql"}State/Province{/ts}' , 8, 'state_province', NULL, 0, NULL, 8, NULL, 0, 0, 1, NULL, NULL),
(@option_group_id_adOpt, '{ts escape="sql"}Country{/ts}' , 9, 'country' , NULL, 0, NULL, 9, NULL, 0, 0, 1, NULL, NULL),
(@option_group_id_adOpt, '{ts escape="sql"}Latitude{/ts}' , 10, 'geo_code_1' , NULL, 0, NULL, 10, NULL, 0, 0, 1, NULL, NULL),
(@option_group_id_adOpt, '{ts escape="sql"}Longitude{/ts}' , 11, 'geo_code_2', NULL, 0, NULL, 11, NULL, 0, 0, 1, NULL, NULL),
......@@ -1424,7 +1424,7 @@ INSERT INTO civicrm_uf_field
( 9, 'city', 1, 0, 5, 'User and User Admin Only', 0, 0, 3, '{ts escape="sql"}City{/ts}', 'Contact', NULL, NULL),
( 9, 'postal_code', 1, 0, 6, 'User and User Admin Only', 0, 0, 3, '{ts escape="sql"}Postal Code{/ts}', 'Contact', NULL, NULL),
( 9, 'country', 1, 0, 7, 'User and User Admin Only', 0, 0, 3, '{ts escape="sql"}Country{/ts}', 'Contact', NULL, NULL),
( 9, 'state_province', 1, 0, 8, 'User and User Admin Only', 0, 0, 3, '{ts escape="sql"}State / Province{/ts}', 'Contact', NULL, NULL),
( 9, 'state_province', 1, 0, 8, 'User and User Admin Only', 0, 0, 3, '{ts escape="sql"}State/Province{/ts}', 'Contact', NULL, NULL),
( 10, 'financial_type', 1, 1, 1, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Type{/ts}', 'Contribution', NULL, NULL ),
( 10, 'total_amount', 1, 1, 2, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Amount{/ts}', 'Contribution', NULL, NULL ),
( 10, 'contribution_status_id', 1, 1, 3, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Status{/ts}', 'Contribution', NULL, NULL ),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment