CRM-15603 - Standardize case of 'Contact Subtype'

diff --git a/CRM/Contact/Form/Task/Batch.php b/CRM/Contact/Form/Task/Batch.php
index b142d0a467ea28ee4d6e5311ef5ac6199dd82efd..32ba02d7ddb64261ad69a016942774a7bb6cc216 100644 (file)
--- a/CRM/Contact/Form/Task/Batch.php
+++ b/CRM/Contact/Form/Task/Batch.php
@@ -261,7 +261,7 @@ class CRM_Contact_Form_Task_Batch extends CRM_Contact_Form_Task {
 
     CRM_Core_Session::setStatus('', ts("Updates Saved"), 'success');
     if ($inValidSubtypeCnt) {
-      CRM_Core_Session::setStatus(ts('Contact SubType field of 1 contact has not been updated.', array('plural' => 'Contact SubType field of %count contacts has not been updated.', 'count' => $inValidSubtypeCnt)), ts('Invalid Subtype'));
+      CRM_Core_Session::setStatus(ts('Contact Subtype field of 1 contact has not been updated.', array('plural' => 'Contact Subtype field of %count contacts has not been updated.', 'count' => $inValidSubtypeCnt)), ts('Invalid Subtype'));
     }
   }
   //end of function

diff --git a/CRM/Contact/Import/Parser/Contact.php b/CRM/Contact/Import/Parser/Contact.php
index 5007ad6896a4d132ac2622c97ac4c1fa89b9e32d..75d2bb0535ad73965e75e9c200a26cca1b1b6770 100644 (file)
--- a/CRM/Contact/Import/Parser/Contact.php
+++ b/CRM/Contact/Import/Parser/Contact.php
@@ -509,7 +509,7 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Contact_Import_Parser {
         $params['contact_sub_type'] = array_search($subType, $subTypes);
       }
       elseif (!CRM_Contact_BAO_ContactType::isExtendsContactType($subType, $this->_contactType)) {
-        $message = "Mismatched or Invalid Contact SubType.";
+        $message = "Mismatched or Invalid Contact Subtype.";
         array_unshift($values, $message);
         return CRM_Import_Parser::NO_MATCH;
       }

diff --git a/CRM/Report/Form/Contact/CurrentEmployer.php b/CRM/Report/Form/Contact/CurrentEmployer.php
index 6a8177a5d632653e8c1d4645f93ccde73860db43..29f013c68606947e0248e13d5194e5458f07ac88 100644 (file)
--- a/CRM/Report/Form/Contact/CurrentEmployer.php
+++ b/CRM/Report/Form/Contact/CurrentEmployer.php
@@ -106,7 +106,7 @@ class CRM_Report_Form_Contact_CurrentEmployer extends CRM_Report_Form {
           ),
           'contact_sub_type' =>
           array(
-            'title' => ts('Contact SubType'),
+            'title' => ts('Contact Subtype'),
           ),
         ),
         'filters' =>

diff --git a/CRM/Report/Form/Contact/Detail.php b/CRM/Report/Form/Contact/Detail.php
index 32f0aa35944439ec5cf4720161df3099e0c3010c..e4a97e65be9029f89bd5dba5a9795305cfedca1f 100644 (file)
--- a/CRM/Report/Form/Contact/Detail.php
+++ b/CRM/Report/Form/Contact/Detail.php
@@ -76,7 +76,7 @@ class CRM_Report_Form_Contact_Detail extends CRM_Report_Form {
           ),
           'contact_sub_type' =>
           array(
-            'title' => ts('Contact SubType'),
+            'title' => ts('Contact Subtype'),
           ),
           'birth_date' =>
           array(

diff --git a/CRM/Report/Form/Contact/Relationship.php b/CRM/Report/Form/Contact/Relationship.php
index 547a08dede649a9e8a9293251d7570836356c99a..1f2041b2a5bff2dc42ca5789c4182df15d86d0f5 100644 (file)
--- a/CRM/Report/Form/Contact/Relationship.php
+++ b/CRM/Report/Form/Contact/Relationship.php
@@ -71,7 +71,7 @@ class CRM_Report_Form_Contact_Relationship extends CRM_Report_Form {
           ),
           'contact_sub_type_a' =>
           array(
-            'title' => ts('Contact SubType (Contact A)'),
+            'title' => ts('Contact Subtype (Contact A)'),
             'name' => 'contact_sub_type',
           ),
         ),
@@ -116,7 +116,7 @@ class CRM_Report_Form_Contact_Relationship extends CRM_Report_Form {
           ),
           'contact_sub_type_b' =>
           array(
-            'title' => ts('Contact SubType (Contact B)'),
+            'title' => ts('Contact Subtype (Contact B)'),
             'name' => 'contact_sub_type',
           ),
         ),

diff --git a/CRM/Report/Form/Contact/Summary.php b/CRM/Report/Form/Contact/Summary.php
index 7a6a1aa0ec7d79338143d6407612a1f3d2e7927e..2ab122ee62932f37ea420ec6c53217c7be2a1103 100644 (file)
--- a/CRM/Report/Form/Contact/Summary.php
+++ b/CRM/Report/Form/Contact/Summary.php
@@ -82,7 +82,7 @@ class CRM_Report_Form_Contact_Summary extends CRM_Report_Form {
           ),
           'contact_sub_type' =>
           array(
-            'title' => ts('Contact SubType'),
+            'title' => ts('Contact Subtype'),
           ),
           'gender_id' =>
           array('title' => ts('Gender'),

diff --git a/CRM/Report/Form/Contribute/Bookkeeping.php b/CRM/Report/Form/Contribute/Bookkeeping.php
index d1e7961e0a987c2562c1fedb1ced2a575c3cdb0d..f94eb7cf4af4344f133d58da431a2a824ef7d469 100644 (file)
--- a/CRM/Report/Form/Contribute/Bookkeeping.php
+++ b/CRM/Report/Form/Contribute/Bookkeeping.php
@@ -72,7 +72,7 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form {
           ),
           'contact_sub_type' =>
           array(
-            'title' => ts('Contact SubType'),
+            'title' => ts('Contact Subtype'),
           ),
         ),
         'filters' =>

diff --git a/CRM/Report/Form/Contribute/Detail.php b/CRM/Report/Form/Contribute/Detail.php
index 19ac2641e1dc34d08b1c84be82aaa4ca1144343e..25dfcb588a6d82bd1361d83b89ece3b4fecc1474 100644 (file)
--- a/CRM/Report/Form/Contribute/Detail.php
+++ b/CRM/Report/Form/Contribute/Detail.php
@@ -85,7 +85,7 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form {
           ),
           'contact_sub_type' =>
           array(
-            'title' => ts('Contact SubType'),
+            'title' => ts('Contact Subtype'),
           ),
         ),
         'filters' =>

diff --git a/CRM/Report/Form/Contribute/History.php b/CRM/Report/Form/Contribute/History.php
index 910aa2a9f9963fddae9688c337f122954b9b893d..8f87fae6352c7a48987fc199cd0de1638096f4e0 100644 (file)
--- a/CRM/Report/Form/Contribute/History.php
+++ b/CRM/Report/Form/Contribute/History.php
@@ -106,7 +106,7 @@ class CRM_Report_Form_Contribute_History extends CRM_Report_Form {
           ),
           'contact_sub_type' =>
           array(
-            'title' => ts('Contact SubType'),
+            'title' => ts('Contact Subtype'),
           ),
         ),
         'grouping' => 'contact-fields',

diff --git a/CRM/Report/Form/Contribute/HouseholdSummary.php b/CRM/Report/Form/Contribute/HouseholdSummary.php
index f011b1060ab353a5b60f4911ddd9d6a4fc6113d3..555b8e462034ae862d6d6dedab3dd9b4c5febbbe 100644 (file)
--- a/CRM/Report/Form/Contribute/HouseholdSummary.php
+++ b/CRM/Report/Form/Contribute/HouseholdSummary.php
@@ -77,7 +77,7 @@ class CRM_Report_Form_Contribute_HouseholdSummary extends CRM_Report_Form {
             'title' => ts('Contact Type'),
           ),
           'contact_sub_type' => array(
-            'title' => ts('Contact SubType'),
+            'title' => ts('Contact Subtype'),
           ),
         ),
         'filters' => array(

diff --git a/CRM/Report/Form/Contribute/Lybunt.php b/CRM/Report/Form/Contribute/Lybunt.php
index 874deb19f216e747aed3f5ee84bb5cb3b32b5dae..82fbe98e409115e632217dafdb7eabe55c98fcc6 100644 (file)
--- a/CRM/Report/Form/Contribute/Lybunt.php
+++ b/CRM/Report/Form/Contribute/Lybunt.php
@@ -95,7 +95,7 @@ class CRM_Report_Form_Contribute_Lybunt extends CRM_Report_Form {
           ),
           'contact_sub_type' =>
           array(
-            'title' => ts('Contact SubType'),
+            'title' => ts('Contact Subtype'),
           ),
         ),
         'filters' =>

diff --git a/CRM/Report/Form/Contribute/OrganizationSummary.php b/CRM/Report/Form/Contribute/OrganizationSummary.php
index d5f3b5b4303350d6f1c26f50d2f31455d12182ad..d58ddbff8d116d6d68ad6c341094b78db9627c3b 100644 (file)
--- a/CRM/Report/Form/Contribute/OrganizationSummary.php
+++ b/CRM/Report/Form/Contribute/OrganizationSummary.php
@@ -88,7 +88,7 @@ class CRM_Report_Form_Contribute_OrganizationSummary extends CRM_Report_Form {
             'title' => ts('Contact Type'),
           ),
           'contact_sub_type' => array(
-            'title' => ts('Contact SubType'),
+            'title' => ts('Contact Subtype'),
           ),
         ),
         'filters' => array(

diff --git a/CRM/Report/Form/Contribute/PCP.php b/CRM/Report/Form/Contribute/PCP.php
index 890f9f0169fd3d5e37128d2dccea6c588e0297e2..a62261a5741338918dd4cb0526e66649c1d80531 100644 (file)
--- a/CRM/Report/Form/Contribute/PCP.php
+++ b/CRM/Report/Form/Contribute/PCP.php
@@ -63,7 +63,7 @@ class CRM_Report_Form_Contribute_PCP extends CRM_Report_Form {
           ),
           'contact_sub_type' =>
           array(
-            'title' => ts('Supporter Contact SubType'),
+            'title' => ts('Supporter Contact Subtype'),
           ),
         ),
         'filters' =>

diff --git a/CRM/Report/Form/Contribute/Repeat.php b/CRM/Report/Form/Contribute/Repeat.php
index 8677285443621d075f4f8957455e721ad3dfa4cc..e10a830dc4290c19748d11d9e90ae2ee4d6c7c97 100644 (file)
--- a/CRM/Report/Form/Contribute/Repeat.php
+++ b/CRM/Report/Form/Contribute/Repeat.php
@@ -80,7 +80,7 @@ class CRM_Report_Form_Contribute_Repeat extends CRM_Report_Form {
           ),
           'contact_sub_type' =>
           array(
-            'title' => ts('Contact SubType'),
+            'title' => ts('Contact Subtype'),
             'no_repeat' => TRUE,
           ),
         ),

diff --git a/CRM/Report/Form/Contribute/SoftCredit.php b/CRM/Report/Form/Contribute/SoftCredit.php
index afff9e4154acfc0ba547bf55a4fd5de3ef2607dc..26867057bac44a6293b5c343cab47c4c4c9d3482 100644 (file)
--- a/CRM/Report/Form/Contribute/SoftCredit.php
+++ b/CRM/Report/Form/Contribute/SoftCredit.php
@@ -101,7 +101,7 @@ class CRM_Report_Form_Contribute_SoftCredit extends CRM_Report_Form {
           ),
           'contact_sub_type' =>
           array(
-            'title' => ts('Contact SubType'),
+            'title' => ts('Contact Subtype'),
           ),
         ),
         'filters' =>

diff --git a/CRM/Report/Form/Contribute/Summary.php b/CRM/Report/Form/Contribute/Summary.php
index ef4023d85a6a7fdd1937e18aa7d1bcc46ed03653..66d2da707c3680b3c5df4c75cef22e00fb219784 100644 (file)
--- a/CRM/Report/Form/Contribute/Summary.php
+++ b/CRM/Report/Form/Contribute/Summary.php
@@ -85,7 +85,7 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form {
           ),
           'contact_sub_type' =>
           array(
-            'title' => ts('Contact SubType'),
+            'title' => ts('Contact Subtype'),
           ),
         ),
         'grouping' => 'contact-fields',

diff --git a/CRM/Report/Form/Contribute/Sybunt.php b/CRM/Report/Form/Contribute/Sybunt.php
index fcb778f592f6fc8cb19187ab5469d85b13f84f91..9dcb2c469e933aeca28ae315a50892a35646d9a8 100644 (file)
--- a/CRM/Report/Form/Contribute/Sybunt.php
+++ b/CRM/Report/Form/Contribute/Sybunt.php
@@ -91,7 +91,7 @@ class CRM_Report_Form_Contribute_Sybunt extends CRM_Report_Form {
           ),
           'contact_sub_type' =>
           array(
-            'title' => ts('Contact SubType'),
+            'title' => ts('Contact Subtype'),
           ),
         ),
         'filters' =>

diff --git a/CRM/Report/Form/Contribute/TopDonor.php b/CRM/Report/Form/Contribute/TopDonor.php
index 25297045f1ac476566f6e312972481bde8ec3757..5a41d22f9bc97570839e5be3758a374c2429dd32 100644 (file)
--- a/CRM/Report/Form/Contribute/TopDonor.php
+++ b/CRM/Report/Form/Contribute/TopDonor.php
@@ -80,7 +80,7 @@ class CRM_Report_Form_Contribute_TopDonor extends CRM_Report_Form {
           ),
           'contact_sub_type' =>
           array(
-            'title' => ts('Contact SubType'),
+            'title' => ts('Contact Subtype'),
           ),
         ),
       ),

diff --git a/CRM/Report/Form/Member/ContributionDetail.php b/CRM/Report/Form/Member/ContributionDetail.php
index 98b128af6c6ca155273650340b4ec1ab73ce6726..f11011479c38772cdac862e3b0d9521609c38f91 100644 (file)
--- a/CRM/Report/Form/Member/ContributionDetail.php
+++ b/CRM/Report/Form/Member/ContributionDetail.php
@@ -83,7 +83,7 @@ class CRM_Report_Form_Member_ContributionDetail extends CRM_Report_Form {
           ),
           'contact_sub_type' =>
           array(
-            'title' => ts('Contact SubType'),
+            'title' => ts('Contact Subtype'),
             'no_repeat' => TRUE,
           ),
           'do_not_email' =>

diff --git a/CRM/Report/Form/Member/Detail.php b/CRM/Report/Form/Member/Detail.php
index e1ee639de19e48591065c38882586f1bfcc10046..70c3a39a613e3cf2f792178d7cf1daf83044b06e 100644 (file)
--- a/CRM/Report/Form/Member/Detail.php
+++ b/CRM/Report/Form/Member/Detail.php
@@ -96,7 +96,7 @@ class CRM_Report_Form_Member_Detail extends CRM_Report_Form {
             'title' => ts('Contact Type'),
           ),
           'contact_sub_type' => array(
-            'title' => ts('Contact SubType'),
+            'title' => ts('Contact Subtype'),
           ),
         ),
         'filters' => array(

diff --git a/CRM/Report/Form/Member/Lapse.php b/CRM/Report/Form/Member/Lapse.php
index 3c6cc56b7fb123d33615e662d8ef38764a9ee7b1..42f5189b7b7037d20f82e45879c1487953f817b0 100644 (file)
--- a/CRM/Report/Form/Member/Lapse.php
+++ b/CRM/Report/Form/Member/Lapse.php
@@ -102,7 +102,7 @@ class CRM_Report_Form_Member_Lapse extends CRM_Report_Form {
           ),
           'contact_sub_type' =>
           array(
-            'title' => ts('Contact SubType'),
+            'title' => ts('Contact Subtype'),
           ),
         ),
         'grouping' => 'contact-fields',

diff --git a/CRM/Report/Form/Member/Summary.php b/CRM/Report/Form/Member/Summary.php
index 1d63923cc6085096fad8f12128876b26d63ea4ca..e684037a0f2e40ecded81adf953eb0f55def0d2b 100644 (file)
--- a/CRM/Report/Form/Member/Summary.php
+++ b/CRM/Report/Form/Member/Summary.php
@@ -149,7 +149,7 @@ class CRM_Report_Form_Member_Summary extends CRM_Report_Form {
           ),
           'contact_sub_type' =>
           array(
-            'title' => ts('Contact SubType'),
+            'title' => ts('Contact Subtype'),
           ),
         ),
       ),

diff --git a/CRM/Utils/DeprecatedUtils.php b/CRM/Utils/DeprecatedUtils.php
index eff034adaf9ef02fb0bf9608421f3829dcd87253..900f6ef8a56468919d28d4e31038e9d50e86e747 100644 (file)
--- a/CRM/Utils/DeprecatedUtils.php
+++ b/CRM/Utils/DeprecatedUtils.php
@@ -1374,7 +1374,7 @@ function _civicrm_api3_deprecated_contact_check_params(
 
     if ($csType = CRM_Utils_Array::value('contact_sub_type', $params)) {
       if (!(CRM_Contact_BAO_ContactType::isExtendsContactType($csType, $params['contact_type']))) {
-        return civicrm_api3_create_error("Invalid or Mismatched Contact SubType: " . implode(', ', (array)$csType));
+        return civicrm_api3_create_error("Invalid or Mismatched Contact Subtype: " . implode(', ', (array)$csType));
       }
     }
 

diff --git a/api/v3/Contact.php b/api/v3/Contact.php
index 8e55caf96b14112d140c6ab0443f5436f9ec0f80..3db94b1622f36ca5ce88d4c00c6f7610d2cb9078 100644 (file)
--- a/api/v3/Contact.php
+++ b/api/v3/Contact.php
@@ -330,7 +330,7 @@ function _civicrm_api3_contact_check_params( &$params, $dupeCheck = true, $dupeE
 
   if (!empty($params['contact_sub_type']) && !empty($params['contact_type'])) {
       if (!(CRM_Contact_BAO_ContactType::isExtendsContactType($params['contact_sub_type'], $params['contact_type']))) {
-        throw new API_Exception("Invalid or Mismatched Contact SubType: " . implode(', ', (array)$params['contact_sub_type']));
+        throw new API_Exception("Invalid or Mismatched Contact Subtype: " . implode(', ', (array)$params['contact_sub_type']));
       }
     }
 

diff --git a/tests/phpunit/api/v3/CustomValueContactTypeTest.php b/tests/phpunit/api/v3/CustomValueContactTypeTest.php
index 1afcfd8844f72a187ab138f648f28af5aa706543..17886daf7998ad0b733a60bc1a96d0c4d2607f41 100644 (file)
--- a/tests/phpunit/api/v3/CustomValueContactTypeTest.php
+++ b/tests/phpunit/api/v3/CustomValueContactTypeTest.php
@@ -47,7 +47,7 @@ class api_v3_CustomValueContactTypeTest extends CiviUnitTestCase {
   function get_info() {
     return array(
       'name' => 'Custom Data For Contact Subtype',
-      'description' => 'Test Custom Data for Contact subtype.',
+      'description' => 'Test Custom Data for Contact Subtype.',
       'group' => 'CiviCRM API Tests',
     );
   }