From 1ca23968479e14f9438f75518b04d3cf299f2acc Mon Sep 17 00:00:00 2001
From: Sascha Grossenbacher <saschagros+test@gmail.com>
Date: Thu, 17 Mar 2011 11:25:57 +0100
Subject: [PATCH] Issue #1095792 by Berdir: Changed user to recipient in conformation message.

---
 privatemsg.pages.inc |    2 +-
 privatemsg.test      |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/privatemsg.pages.inc b/privatemsg.pages.inc
index e0353e0..f5e7872 100644
--- a/privatemsg.pages.inc
+++ b/privatemsg.pages.inc
@@ -487,7 +487,7 @@ function privatemsg_new_validate($form, &$form_state) {
 
   if (!empty($invalid)) {
     // Display information about invalid recipients.
-    drupal_set_message(t('The following users will not receive this private message: @invalid.', array('@invalid' => implode(", ", $invalid))), 'error');
+    drupal_set_message(t('The following recipients will not receive this private message: @invalid.', array('@invalid' => implode(", ", $invalid))), 'error');
   }
   if (!empty($denieds)) {
     // Display information about denied recipients.
diff --git a/privatemsg.test b/privatemsg.test
index 5899950..d1cb62f 100644
--- a/privatemsg.test
+++ b/privatemsg.test
@@ -276,7 +276,7 @@ class PrivatemsgTestCase extends DrupalWebTestCase {
 
     $this->drupalPost('messages/new', $editinvalid, t('Send message'));
     $this->assertText(t('You must include at least one valid recipient.'), 'Message was not sent.');
-    $this->assertText(t('The following users will not receive this private message: @recipients', array('@recipients' => $editinvalid['recipient'])), 'Message about non-existing user displayed.');
+    $this->assertText(t('The following recipients will not receive this private message: @recipients.', array('@recipients' => $editinvalid['recipient'])), 'Message about non-existing user displayed.');
 
     $this->drupalPost('messages/new', $editnobody, t('Send message'));
     $this->assertText(t('A message has been sent to @recipients.', array('@recipients' => $recipient->name)), 'Message sent confirmation displayed.');
@@ -289,7 +289,7 @@ class PrivatemsgTestCase extends DrupalWebTestCase {
 
     $this->drupalPost('messages/new', $editmixed, t('Send message'));
     $this->assertText(t('A message has been sent to @recipients.', array('@recipients' => $recipient->name)), 'Message sent confirmation displayed.');
-    $this->assertText(t('The following users will not receive this private message: @recipients', array('@recipients' => $invalidmixed)), 'Message about non-existing user displayed.');
+    $this->assertText(t('The following recipients will not receive this private message: @recipients.', array('@recipients' => $invalidmixed)), 'Message about non-existing user displayed.');
 
     $this->drupalPost('messages/new', $editformatted, t('Send message'));
     $this->assertText(t('A message has been sent to @recipients.', array('@recipients' => $recipient2->name)), 'Message sent confirmation displayed.');
-- 
1.7.4.1

