From: Brian Shaughnessy <brian@lcdservices.biz>
Date: Sat, 25 Jul 2015 23:28:49 +0000 (-0400)
Subject: CRM-16916 fix validation when formatting field present
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8d1725162db294ed805f482648d0ff1cd7078b28;p=civicrm-core.git

CRM-16916 fix validation when formatting field present
---

diff --git a/CRM/UF/Form/Field.php b/CRM/UF/Form/Field.php
index cd4e8d25f4..a41f06df59 100644
--- a/CRM/UF/Form/Field.php
+++ b/CRM/UF/Form/Field.php
@@ -638,9 +638,10 @@ class CRM_UF_Form_Field extends CRM_Core_Form {
             'Individual',
             'Contact',
             'Activity',
+            'Formatting',
           ))
         ) {
-          $errors['field_name'] = ts('Cannot add or update profile field "%1" with combination of Household or Organization or any subtypes of Household or Organisation.', array(1 => $fieldType));
+          $errors['field_name'] = ts('Cannot add or update profile field "%1" with combination of Household or Organization or any subtypes of Household or Organization.', array(1 => $fieldType));
           break;
         }
       }