CRM-15603 - Standardize phrasing of 'Mismatched or Invalid contact subtype found...
authorColeman Watts <coleman@civicrm.org>
Sun, 16 Nov 2014 03:13:15 +0000 (22:13 -0500)
committerColeman Watts <coleman@civicrm.org>
Sun, 16 Nov 2014 13:41:38 +0000 (08:41 -0500)
CRM/Contact/Import/Parser/Contact.php

index 75d2bb0535ad73965e75e9c200a26cca1b1b6770..328195ddaa333fccfa55bec5acc73d3e43a39344 100644 (file)
@@ -745,7 +745,7 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Contact_Import_Parser {
           if (isset($relationType->$direction)) {
             //validation of related contact subtype for update mode
             if ($relCsType = CRM_Utils_Array::value('contact_sub_type', $params[$key]) && $relCsType != $relationType->$direction) {
-              $errorMessage = ts("Mismatched or Invalid contact subtype found for this related contact");
+              $errorMessage = ts("Mismatched or Invalid contact subtype found for this related contact.");
               array_unshift($values, $errorMessage);
               return CRM_Import_Parser::NO_MATCH;
             }
@@ -783,7 +783,7 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Contact_Import_Parser {
 
               if (!empty($relatedCsType) && (!CRM_Contact_BAO_ContactType::isAllowEdit($params[$key]['id'], $relatedCsType) &&
                 $relatedCsType != CRM_Utils_Array::value('contact_sub_type', $formatting))) {
-                $errorMessage = ts("Mismatched or Invalid contact subtype found for this related contact ID: %1", array(1 => $params[$key]['id']));
+                $errorMessage = ts("Mismatched or Invalid contact subtype found for this related contact.") . ' ' . ts("ID: %1", array(1 => $params[$key]['id']));
                 array_unshift($values, $errorMessage);
                 return CRM_Import_Parser::NO_MATCH;
               }