From 8543f7c1dfa5d4be28ab4bb04243c0dc23c9c029 Mon Sep 17 00:00:00 2001
From: Dave Greenberg <dave@civicrm.org>
Date: Sun, 6 Oct 2013 11:47:40 +0100
Subject: [PATCH] CRM-13475 - Tweak to error message text.

----------------------------------------
* CRM-13475: Entering an invalid credit card number gives the wrong field validation error
  http://issues.civicrm.org/jira/browse/CRM-13475
---
 CRM/Core/Payment/Form.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CRM/Core/Payment/Form.php b/CRM/Core/Payment/Form.php
index f193753892..34a8cf849c 100644
--- a/CRM/Core/Payment/Form.php
+++ b/CRM/Core/Payment/Form.php
@@ -262,7 +262,7 @@ class CRM_Core_Payment_Form {
       );
 
       $form->addRule('credit_card_exp_date',
-        ts('Credit card expiration date cannot be a past date.'),
+        ts('Card expiration date cannot be a past date.'),
         'currentDate', TRUE
       );
 
@@ -355,16 +355,16 @@ class CRM_Core_Payment_Form {
       if (!empty($values['credit_card_number']) &&
         !CRM_Utils_Rule::creditCardNumber($values['credit_card_number'], $values['credit_card_type'])
       ) {
-        $errors['credit_card_number'] = ts('Please enter a valid Credit Card Number');
+        $errors['credit_card_number'] = ts('Please enter a valid Card Number');
       }
       if (!empty($values['cvv2']) &&
         !CRM_Utils_Rule::cvv($values['cvv2'], $values['credit_card_type'])
       ) {
-        $errors['cvv2'] = ts('Please enter a valid Credit Card Verification Number');
+        $errors['cvv2'] = ts('Please enter a valid Card Verification Number');
       }
     }
     elseif (!empty($values['credit_card_number'])) {
-      $errors['credit_card_number'] = ts('Please enter a valid Credit Card Number and Type');
+      $errors['credit_card_number'] = ts('Please enter a valid Card Number');
     }
   }
 
-- 
2.25.1