CRM-15603 - Standardize email validation strings

diff --git a/CRM/Admin/Form/Options.php b/CRM/Admin/Form/Options.php
index 3b5825d07881aa5aaa483d9597538f0aa3904c08..44f7665789a8b9d06821a81d9c4e8b5c33d446d3 100644 (file)
--- a/CRM/Admin/Form/Options.php
+++ b/CRM/Admin/Form/Options.php
@@ -355,7 +355,7 @@ class CRM_Admin_Form_Options extends CRM_Admin_Form {
     if ($self->_gName == 'from_email_address') {
       $formEmail = CRM_Utils_Mail::pluckEmailFromHeader($fields['label']);
       if (!CRM_Utils_Rule::email($formEmail)) {
-        $errors['label'] = ts('Please enter the valid email address.');
+        $errors['label'] = ts('Please enter a valid email address.');
       }
 
       $formName = explode('"', $fields['label']);

diff --git a/CRM/Contribute/Form/ContributionPage/Premium.php b/CRM/Contribute/Form/ContributionPage/Premium.php
index e88b659ea635addd7dc28379840deab25da736a6..69b592586080f930a8cf6ab7dca795e39f54439c 100644 (file)
--- a/CRM/Contribute/Form/ContributionPage/Premium.php
+++ b/CRM/Contribute/Form/ContributionPage/Premium.php
@@ -76,7 +76,7 @@ class CRM_Contribute_Form_ContributionPage_Premium extends CRM_Contribute_Form_C
 
     $this->add('text', 'premiums_contact_email', ts('Contact Email') . ' ', $attributes['premiums_contact_email']);
 
-    $this->addRule('premiums_contact_email', ts('Please enter a valid email address for Contact Email') . ' ', 'email');
+    $this->addRule('premiums_contact_email', ts('Please enter a valid email address.') . ' ', 'email');
 
     $this->add('text', 'premiums_contact_phone', ts('Contact Phone'), $attributes['premiums_contact_phone']);
 

diff --git a/CRM/Mailing/Form/Subscribe.php b/CRM/Mailing/Form/Subscribe.php
index ed32a7a98ad4cd0a4f814392c3c2fc0b6c1f1819..41fa7436eea9e79519ee792c79e985270c16ee3b 100644 (file)
--- a/CRM/Mailing/Form/Subscribe.php
+++ b/CRM/Mailing/Form/Subscribe.php
@@ -93,7 +93,7 @@ SELECT   title, description
       ),
       TRUE
     );
-    $this->addRule('email', ts("Please enter a valid email address (e.g. 'yourname@example.com')."), 'email');
+    $this->addRule('email', ts("Please enter a valid email address."), 'email');
 
     if (!$this->_groupID) {
       // create a selector box of all public groups

diff --git a/CRM/Mailing/Form/Test.php b/CRM/Mailing/Form/Test.php
index 677de42610d56d973b4a24275294c9c07007b274..8ef9fcbf71bf742d98eaadcafe059cdca0f7d2dc 100644 (file)
--- a/CRM/Mailing/Form/Test.php
+++ b/CRM/Mailing/Form/Test.php
@@ -216,7 +216,7 @@ class CRM_Mailing_Form_Test extends CRM_Core_Form {
           $testParams['emails'][] = $email;
           $emails .= $emails ? ",'$email'" : "'$email'";
           if (!CRM_Utils_Rule::email($email)) {
-            CRM_Core_Session::setStatus(ts('Please enter a valid email addresses.'), ts('Test not sent.'), 'error');
+            CRM_Core_Session::setStatus(ts('Please enter a valid email address.'), ts('Test not sent.'), 'error');
             $error = TRUE;
           }
         }