From e89941dcb0e30e9bbb7be9b7e3233c9704f816e8 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 14 Jun 2013 16:37:23 +0200
Subject: [PATCH] CRM-12809 - For public screens, use phrase "custom field-set"

Per michaelmcandrew, "custom group" shouldn't appear in docs or web UI

----------------------------------------
* CRM-12809: Reserved CustomGroups
  http://issues.civicrm.org/jira/browse/CRM-12809
---
 CRM/Custom/Form/Field.php  | 2 +-
 CRM/Custom/Form/Group.php  | 2 +-
 CRM/Custom/Form/Option.php | 2 +-
 CRM/Custom/Page/Field.php  | 2 +-
 CRM/Custom/Page/Option.php | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CRM/Custom/Form/Field.php b/CRM/Custom/Form/Field.php
index 0f7f5cde98..7de6ba95f8 100644
--- a/CRM/Custom/Form/Field.php
+++ b/CRM/Custom/Form/Field.php
@@ -107,7 +107,7 @@ class CRM_Custom_Form_Field extends CRM_Core_Form {
     $this->_gid = CRM_Utils_Request::retrieve('gid', 'Positive', $this);
 
     if ($isReserved = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $this->_gid, 'is_reserved', 'id')) {
-      CRM_Core_Error::fatal("You cannot add or edit fields of a Reserved Custom Group");
+      CRM_Core_Error::fatal("You cannot add or edit fields in a reserved custom field-set.");
     }
 
     if ($this->_gid) {
diff --git a/CRM/Custom/Form/Group.php b/CRM/Custom/Form/Group.php
index 486ef5a4d4..a56f2c93b1 100644
--- a/CRM/Custom/Form/Group.php
+++ b/CRM/Custom/Form/Group.php
@@ -83,7 +83,7 @@ class CRM_Custom_Form_Group extends CRM_Core_Form {
     $this->_id = $this->get('id');
 
     if ($isReserved = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $this->_id, 'is_reserved', 'id')) {
-      CRM_Core_Error::fatal("You cannot edit the settings of a Reserved Custom Group");
+      CRM_Core_Error::fatal("You cannot edit the settings of a reserved custom field-set.");
     }
     // setting title for html page
     if ($this->_action == CRM_Core_Action::UPDATE) {
diff --git a/CRM/Custom/Form/Option.php b/CRM/Custom/Form/Option.php
index 3a1da1d396..a19f780cf3 100644
--- a/CRM/Custom/Form/Option.php
+++ b/CRM/Custom/Form/Option.php
@@ -81,7 +81,7 @@ class CRM_Custom_Form_Option extends CRM_Core_Form {
     $this->_gid = CRM_Utils_Request::retrieve('gid', 'Positive', $this);
 
     if ($isReserved = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $this->_gid, 'is_reserved', 'id')) {
-      CRM_Core_Error::fatal("You cannot add or edit muliple choice options of a Reserved Custom Group Field");
+      CRM_Core_Error::fatal("You cannot add or edit muliple choice options in a reserved custom field-set.");
     }
     if (!isset($this->_gid) && $this->_fid) {
       $this->_gid = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomField',
diff --git a/CRM/Custom/Page/Field.php b/CRM/Custom/Page/Field.php
index 8030604c2c..417514be0c 100644
--- a/CRM/Custom/Page/Field.php
+++ b/CRM/Custom/Page/Field.php
@@ -233,7 +233,7 @@ class CRM_Custom_Page_Field extends CRM_Core_Page {
     );
 
     if ($isReserved = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $this->_gid, 'is_reserved', 'id')) {
-      CRM_Core_Error::fatal("You cannot add or edit fields of a Reserved Custom Group");
+      CRM_Core_Error::fatal("You cannot add or edit fields in a reserved custom field-set.");
     }
 
     $action = CRM_Utils_Request::retrieve('action', 'String',
diff --git a/CRM/Custom/Page/Option.php b/CRM/Custom/Page/Option.php
index 2ae8574f94..01ac01744d 100644
--- a/CRM/Custom/Page/Option.php
+++ b/CRM/Custom/Page/Option.php
@@ -279,7 +279,7 @@ ORDER BY weight, label
     );
 
     if ($isReserved = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $this->_gid, 'is_reserved', 'id')) {
-      CRM_Core_Error::fatal("You cannot add or edit muliple choice options of a Reserved Custom Group Field");
+      CRM_Core_Error::fatal("You cannot add or edit muliple choice options in a reserved custom field-set.");
     }
 
     //as url contain $gid so append breadcrumb dynamically.
-- 
2.25.1