From 5ab78070487e623a4ef7f8c96b11d25f11944e86 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 15 Nov 2014 21:36:46 -0500
Subject: [PATCH] CRM-15603 - Standardize phrasing of 'Name cannot not start
 with a digit.'

---
 CRM/Custom/Form/Field.php  | 8 ++++----
 CRM/Custom/Form/Group.php  | 2 +-
 CRM/Custom/Form/Option.php | 2 +-
 CRM/Price/Form/Set.php     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CRM/Custom/Form/Field.php b/CRM/Custom/Form/Field.php
index 7a949990d4..16204a3c0b 100644
--- a/CRM/Custom/Form/Field.php
+++ b/CRM/Custom/Form/Field.php
@@ -595,7 +595,7 @@ class CRM_Custom_Form_Field extends CRM_Core_Form {
       // gives the ascii value
       $asciiValue = ord($title{0});
       if ($asciiValue >= 48 && $asciiValue <= 57) {
-        $errors['label'] = ts("Field's Name should not start with digit");
+        $errors['label'] = ts("Name cannot not start with a digit");
       }
     }
 
@@ -614,19 +614,19 @@ class CRM_Custom_Form_Field extends CRM_Core_Form {
       switch ($dataType) {
         case 'Int':
           if (!CRM_Utils_Rule::integer($default)) {
-            $errors['default_value'] = ts('Please enter a valid integer as default value.');
+            $errors['default_value'] = ts('Please enter a valid integer.');
           }
           break;
 
         case 'Float':
           if (!CRM_Utils_Rule::numeric($default)) {
-            $errors['default_value'] = ts('Please enter a valid number as default value.');
+            $errors['default_value'] = ts('Please enter a valid number.');
           }
           break;
 
         case 'Money':
           if (!CRM_Utils_Rule::money($default)) {
-            $errors['default_value'] = ts('Please enter a valid number value.');
+            $errors['default_value'] = ts('Please enter a valid number.');
           }
           break;
 
diff --git a/CRM/Custom/Form/Group.php b/CRM/Custom/Form/Group.php
index 79f23df779..2e497f2445 100644
--- a/CRM/Custom/Form/Group.php
+++ b/CRM/Custom/Form/Group.php
@@ -167,7 +167,7 @@ class CRM_Custom_Form_Group extends CRM_Core_Form {
       // gives the ascii value
       $asciiValue = ord($title{0});
       if ($asciiValue >= 48 && $asciiValue <= 57) {
-        $errors['title'] = ts("Set's Name should not start with digit");
+        $errors['title'] = ts("Name cannot not start with a digit");
       }
     }
 
diff --git a/CRM/Custom/Form/Option.php b/CRM/Custom/Form/Option.php
index f509ff6090..a375a8b164 100644
--- a/CRM/Custom/Form/Option.php
+++ b/CRM/Custom/Form/Option.php
@@ -342,7 +342,7 @@ SELECT data_type
         case 'Float':
           //     case 'Money':
           if (!CRM_Utils_Rule::numeric($fields["value"])) {
-            $errors['value'] = ts('Please enter a valid number value.');
+            $errors['value'] = ts('Please enter a valid number.');
           }
           break;
 
diff --git a/CRM/Price/Form/Set.php b/CRM/Price/Form/Set.php
index e0f8e431b2..1aadbe2b05 100644
--- a/CRM/Price/Form/Set.php
+++ b/CRM/Price/Form/Set.php
@@ -103,7 +103,7 @@ class CRM_Price_Form_Set extends CRM_Core_Form {
     // gives the ascii value
     $asciiValue = ord($title{0});
     if ($asciiValue >= 48 && $asciiValue <= 57) {
-      $errors['title'] = ts("Set's Name should not start with digit");
+      $errors['title'] = ts("Name cannot not start with a digit");
     }
     return empty($errors) ? TRUE : $errors;
   }
-- 
2.25.1