From db18d815870f99b3dd7472681eec044ba5a49776 Mon Sep 17 00:00:00 2001
From: Nikki Murray <nikki@agh4.localdomain>
Date: Tue, 22 Sep 2015 17:24:07 -0400
Subject: [PATCH] CRM-17264: Profile: Duplicate User Notice Text Is Confusing

---
 CRM/Utils/System/Drupal.php    | 2 +-
 CRM/Utils/System/Joomla.php    | 2 +-
 CRM/Utils/System/WordPress.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CRM/Utils/System/Drupal.php b/CRM/Utils/System/Drupal.php
index 008b801cba..d189ddd55c 100644
--- a/CRM/Utils/System/Drupal.php
+++ b/CRM/Utils/System/Drupal.php
@@ -150,7 +150,7 @@ class CRM_Utils_System_Drupal extends CRM_Utils_System_DrupalBase {
         )->fetchField();
         if ((bool) $uid) {
           $resetUrl = $config->userFrameworkBaseURL . 'user/password';
-          $errors[$emailName] = ts('The email address %1 is already registered. <a href="%2">Have you forgotten your password?</a>',
+          $errors[$emailName] = ts('The email address %1 already has an account associated with it. <a href="%2">Have you forgotten your password?</a>',
             array(1 => $params['mail'], 2 => $resetUrl)
           );
         }
diff --git a/CRM/Utils/System/Joomla.php b/CRM/Utils/System/Joomla.php
index 850d5c0fdc..821187b9f0 100644
--- a/CRM/Utils/System/Joomla.php
+++ b/CRM/Utils/System/Joomla.php
@@ -155,7 +155,7 @@ class CRM_Utils_System_Joomla extends CRM_Utils_System_Base {
       }
       if (strtolower($dbEmail) == strtolower($email)) {
         $resetUrl = str_replace('administrator/', '', $config->userFrameworkBaseURL) . 'index.php?option=com_users&view=reset';
-        $errors[$emailName] = ts('The email address %1 is already registered. <a href="%2">Have you forgotten your password?</a>',
+        $errors[$emailName] = ts('The email address %1 ialready has an account associated with it. <a href="%2">Have you forgotten your password?</a>',
           array(1 => $email, 2 => $resetUrl)
         );
       }
diff --git a/CRM/Utils/System/WordPress.php b/CRM/Utils/System/WordPress.php
index 4f17c54648..a1d4110f7e 100644
--- a/CRM/Utils/System/WordPress.php
+++ b/CRM/Utils/System/WordPress.php
@@ -508,7 +508,7 @@ class CRM_Utils_System_WordPress extends CRM_Utils_System_Base {
       }
       elseif (email_exists($params['mail'])) {
         $resetUrl = $config->userFrameworkBaseURL . 'wp-login.php?action=lostpassword';
-        $errors[$emailName] = ts('The email address %1 is already registered. <a href="%2">Have you forgotten your password?</a>',
+        $errors[$emailName] = ts('The email address %1 already has an account associated with it. <a href="%2">Have you forgotten your password?</a>',
           array(1 => $params['mail'], 2 => $resetUrl)
         );
       }
-- 
2.25.1