? .cvsignore
? privatemsg_statistics
? text_changes2.patch
? text_changes3.patch
Index: privatemsg.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/privatemsg/privatemsg.module,v
retrieving revision 1.144
diff -u -p -r1.144 privatemsg.module
--- privatemsg.module	5 Aug 2010 09:17:54 -0000	1.144
+++ privatemsg.module	13 Aug 2010 15:18:56 -0000
@@ -1442,14 +1442,14 @@ function _privatemsg_validate_message(&$
   if (!(privatemsg_user_access('write privatemsg', $message['author']) || (privatemsg_user_access('reply only privatemsg', $message['author']) && isset($message['thread_id'])))) {
     // no need to do further checks in this case...
     if ($form) {
-      form_set_error('author', t('User @user is not allowed to write messages', array('@user' => $message['author']->name)));
+      form_set_error('author', t('You are not allowed to write messages.'));
       return array(
         'success'  => FALSE,
         'messages'   => $messages,
       );
     }
     else {
-      $messages['error'][] = t('User @user is not allowed to write messages', array('@user' => $message['author']->name));
+      $messages['error'][] = t('@user is not allowed to write messages.', array('@user' => $message['author']->name));
       return array(
          'success'  => FALSE,
          'messages'   => $messages,
@@ -1459,20 +1459,20 @@ function _privatemsg_validate_message(&$
 
   if (empty($message['subject'])) {
     if ($form) {
-      form_set_error('subject', t('Disallowed to send a message without a subject'));
+      form_set_error('subject', t('You must include a subject line with your message.'));
     }
     else {
-      $messages['error'][] = t('Disallowed to send a message without a subject');
+      $messages['error'][] = t('A subject must be included with the message.');
     }
   }
 
   // Don't allow replies without a body.
   if (!empty($message['thread_id']) && empty($message['body'])) {
     if ($form) {
-      form_set_error('body', t('Disallowed to send reply without a message.'));
+      form_set_error('body', t('You must include a message in your reply.'));
     }
     else {
-      $messages['error'][] = t('Disallowed to send reply without a message.');
+      $messages['error'][] = t('A message must be included in your reply.');
     }
   }
   // Check if an allowed format is used. global $user needs to be changed since
@@ -1484,10 +1484,10 @@ function _privatemsg_validate_message(&$
 
   if (!filter_access($message['format'])) {
     if ($form) {
-      form_set_error('format', t('You are not allowed to use the specified input format.'));
+      form_set_error('format', t('You are not allowed to use the specified format.'));
     }
     else {
-      $messages['error'][] = t('User @user is not allowed to use the specified input format.', array('@user' => $message['author']->name));
+      $messages['error'][] = t('@user is not allowed to use the specified input format.', array('@user' => $message['author']->name));
     }
   }
 
@@ -1496,10 +1496,10 @@ function _privatemsg_validate_message(&$
 
   if (empty($message['recipients']) || !is_array($message['recipients'])) {
     if ($form) {
-      form_set_error('to', t('Disallowed to send a message without at least one valid recipient'));
+      form_set_error('to', t('You must include at least one valid recipient.'));
     }
     else {
-      $messages['error'][] = t('Disallowed to send a message without at least one valid recipient');
+      $messages['error'][] = t('At least one valid recipient must be included with the message.');
     }
   }
 
@@ -1521,10 +1521,10 @@ function _privatemsg_validate_message(&$
   // Check again, give another error message if all recipients are blocked
   if (empty($message['recipients'])) {
     if ($form) {
-      form_set_error('to', t('Disallowed to send message because all recipients are blocked'));
+      form_set_error('to', t('You are not allowed to send this message because all recipients are blocked.'));
     }
     else {
-      $messages['error'][] = t('Disallowed to send message because all recipients are blocked');
+      $messages['error'][] = t('This message cannot be sent because all recipients are blocked.');
     }
   }
 
Index: privatemsg.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/privatemsg/privatemsg.test,v
retrieving revision 1.21
diff -u -p -r1.21 privatemsg.test
--- privatemsg.test	17 Jul 2010 10:34:43 -0000	1.21
+++ privatemsg.test	13 Aug 2010 15:18:57 -0000
@@ -273,10 +273,10 @@ class PrivatemsgTestCase extends DrupalW
     $this->assertText(t('A message has been sent to @recipients.', array('@recipients' => implode(', ', array($recipient->name, $recipient2->name)))), 'Message sent confirmation displayed.');
 
     $this->drupalPost('messages/new', $editnone, t('Send message'));
-    $this->assertText(t('Disallowed to send a message without at least one valid recipient'), 'Message was not sent.');
+    $this->assertText(t('You must include at least one valid recipient.'), 'Message was not sent.');
 
     $this->drupalPost('messages/new', $editinvalid, t('Send message'));
-    $this->assertText(t('Disallowed to send a message without at least one valid recipient'), 'Message was not sent.');
+    $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->drupalPost('messages/new', $editnobody, t('Send message'));
@@ -286,7 +286,7 @@ class PrivatemsgTestCase extends DrupalW
     $this->assertText(t('A message has been sent to @recipients.', array('@recipients' => $recipient->name)), 'Message sent confirmation displayed.');
 
     $this->drupalPost('messages/new', $editempty, t('Send message'));
-    $this->assertText(t('Disallowed to send a message without a subject'), 'Empty subject message displayed.');
+    $this->assertText(t('You must include a subject line with your message.'), 'Empty subject message displayed.');
 
     $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.');
@@ -318,7 +318,7 @@ class PrivatemsgTestCase extends DrupalW
     $this->assertText($reply['body'], 'New message body displayed.');
 
     $this->drupalPost(NULL, $replyempty, t('Send message'));
-    $this->assertText(t('Disallowed to send reply without a message.'));
+    $this->assertText(t('You must include a message in your reply.'));
 
     // reply with a bold part, not allowed with default format
     $replyformatted = array(
@@ -411,7 +411,7 @@ class PrivatemsgTestCase extends DrupalW
     );
     $this->drupalLogin($enableduser);
     $this->drupalPost('messages/new', $message, t('Send message'));
-    $this->assertText(t('Disallowed to send message because all recipients are blocked'), 'Message was not sent.');
+    $this->assertText(t('You are not allowed to send this message because all recipients are blocked.'));
 
     // Make sure that a message to multiple recipients still works if one is
     // disabled.
@@ -882,6 +882,6 @@ class PrivatemsgLinksTestCase extends Dr
     $this->drupalLogin($user);
     $this->assertRaw('<h2>New message</h2>', t('Privatemsg new block title displayed.'));
 
-    $this->assertText(t('You have a new message, click here to read it'), t('New message indication displayed.'));
+    $this->assertText(t('You have a new message! Click here to read it.'), t('New message indication displayed.'));
   }
 }
Index: privatemsg.theme.inc
===================================================================
RCS file: /cvs/drupal/contributions/modules/privatemsg/privatemsg.theme.inc,v
retrieving revision 1.3
diff -u -p -r1.3 privatemsg.theme.inc
--- privatemsg.theme.inc	12 Jul 2010 06:56:53 -0000	1.3
+++ privatemsg.theme.inc	13 Aug 2010 15:18:57 -0000
@@ -301,8 +301,8 @@ function theme_privatemsg_new_block($cou
     $text = t('Click here to go to your messages.');
   }
   else {
-    $text = format_plural($count, 'You have a new message, click here to read it',
-                        'You have @count new messages, click here to read them',
+    $text = format_plural($count, 'You have a new message! Click here to read it.',
+                        'You have @count new messages! Click here to read them.',
                         array('@count' => $count));
     }
 
Index: pm_block_user/pm_block_user.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/privatemsg/pm_block_user/pm_block_user.module,v
retrieving revision 1.9
diff -u -p -r1.9 pm_block_user.module
--- pm_block_user/pm_block_user.module	9 Aug 2010 14:00:19 -0000	1.9
+++ pm_block_user/pm_block_user.module	13 Aug 2010 15:18:57 -0000
@@ -195,7 +195,7 @@ function pm_block_user_privatemsg_block_
     if (_pm_block_user_rule_exists($author, $recipients[$id], PM_BLOCK_USER_DISALLOW_SENDING)) {
       $blocked[] = array(
         'recipient' => $id,
-        'message' => t('Sorry, private messaging rules forbid sending messages to !name.', array('!name' => $recipients[$id]->name)),
+        'message' => t('You are not permitted to send messages to [username].', array('!name' => $recipients[$id]->name)),
       );
     }
   }
@@ -227,7 +227,7 @@ function pm_block_user_privatemsg_block_
     }
     $blocked[] = array(
       'recipient' => privatemsg_recipient_key($recipient),
-      'message' => t('%name has chosen to not recieve any more messages from you.', array('%name' => $recipient->name))
+      'message' => t('%name has chosen to block messages from you.', array('%name' => $recipient->name))
     );
   }
   return $blocked;
Index: pm_block_user/pm_block_user.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/privatemsg/pm_block_user/pm_block_user.test,v
retrieving revision 1.4
diff -u -p -r1.4 pm_block_user.test
--- pm_block_user/pm_block_user.test	6 Jul 2010 18:03:07 -0000	1.4
+++ pm_block_user/pm_block_user.test	13 Aug 2010 15:18:57 -0000
@@ -94,8 +94,8 @@ class PrivatemsgBlockUserCase extends Dr
       'body'    => $this->randomName(50),
     );
     $this->drupalPost('messages/new', $edit, t('Send message'));
-    $this->assertRaw(t('%user has chosen to not recieve any more messages from you.', array('%user' => $user1->name)), t('User 1 blocks user 2 message displayed'));
-    $this->assertText(t('Disallowed to send message because all recipients are blocked'), t('Disallowed to send message displayed'));
+    $this->assertRaw(t('%user has chosen to block messages from you.', array('%user' => $user1->name)), t('User 1 blocks user 2 message displayed'));
+    $this->assertText(t('You are not allowed to send this message because all recipients are blocked.'));
 
     $edit = array(
       'recipient' => $user1->name . ', ' . $user3->name,
@@ -103,7 +103,7 @@ class PrivatemsgBlockUserCase extends Dr
       'body'    => $this->randomName(50),
     );
     $this->drupalPost('messages/new', $edit, t('Send message'));
-    $this->assertRaw(t('%user has chosen to not recieve any more messages from you.', array('%user' => $user1->name)), t('User 1 blocks user 2 message displayed'));
+    $this->assertRaw(t('%user has chosen to block messages from you.', array('%user' => $user1->name)), t('User 1 blocks user 2 message displayed'));
     $this->assertText(t('A message has been sent to @user.', array('@user' => $user3->name)), t('Message sent to user 3'));
 
 
Index: privatemsg_roles/privatemsg_roles.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/privatemsg/privatemsg_roles/privatemsg_roles.test,v
retrieving revision 1.5
diff -u -p -r1.5 privatemsg_roles.test
--- privatemsg_roles/privatemsg_roles.test	12 Jul 2010 19:45:49 -0000	1.5
+++ privatemsg_roles/privatemsg_roles.test	13 Aug 2010 15:18:57 -0000
@@ -143,7 +143,7 @@ class PrivatemsgRolesTestCase extends Dr
       'body' => $this->randomName(50),
     );
     $this->drupalPost('messages/new', $edit, t('Send message'));
-    $this->assertText(t('Disallowed to send a message without at least one valid recipient'));
+    $this->assertText(t('You must include at least one valid recipient.'));
   }
 
   function testSendMessageToRole() {
Index: tests/privatemsgapi.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/privatemsg/tests/privatemsgapi.test,v
retrieving revision 1.6
diff -u -p -r1.6 privatemsgapi.test
--- tests/privatemsgapi.test	6 Jul 2010 18:03:07 -0000	1.6
+++ tests/privatemsgapi.test	13 Aug 2010 15:18:57 -0000
@@ -51,22 +51,22 @@ class PrivatemsgAPITestCase extends Drup
     $this->assertTrue($resultok2['success'], 'API allowed to send message without body');
 
     $resultf1 = privatemsg_new_thread(array($recipient1, $recipient2, $recipient3), '', 'No subject', array('author' => $author));
-    $this->assertEqual('Disallowed to send a message without a subject', $resultf1['messages']['error'][0], 'API denied to send message without a subject');
+    $this->assertEqual('A subject must be included with the message.', $resultf1['messages']['error'][0], 'API denied to send message without a subject');
 
     $resultf2 = privatemsg_new_thread(array(), 'no recipients', 'Body text', array('author' => $author));
-    $this->assertEqual('Disallowed to send a message without at least one valid recipient', $resultf2['messages']['error'][0], 'API denied to send message without recipients');
+    $this->assertEqual('At least one valid recipient must be included with the message.', $resultf2['messages']['error'][0], 'API denied to send message without recipients');
     $message = $this->getMessageFromSubject('no recipients');
     $this->assertTrue(empty($message), 'Message was not saved in database');
 
     $resultf3 = privatemsg_new_thread(array($recipient1, $recipient2, $recipient3), 'not allowed', 'Body text', array('author' => $recipient1));
-    $errormessage = 'User '. $recipient1->name .' is not allowed to write messages';
+    $errormessage = t('@user is not allowed to write messages.', array('@user' => $recipient1->name));
     $this->assertEqual($errormessage, $resultf3['messages']['error'][0], 'API denied to send message from user without permission');
     $message = $this->getMessageFromSubject('not allowed');
     $this->assertTrue(empty($message), 'Message was not saved in database');
 
     // Test with an input format that the author is not allowed to use.
     $resultf4 = privatemsg_new_thread(array($recipient1, $recipient2, $recipient3), 'input filter not allowed', 'Body text', array('author' => $author, 'format' => 2));
-    $errormessage = t('User @user is not allowed to use the specified input format.', array('@user' => $author->name));
+    $errormessage = t('@user is not allowed to use the specified input format.', array('@user' => $author->name));
     $this->assertEqual($errormessage, $resultf4['messages']['error'][0], t('User is not allowed to use the specified input format.'));
     $message = $this->getMessageFromSubject('input filter not allowed');
     $this->assertTrue(empty($message), 'Message was not saved in database');
@@ -107,10 +107,10 @@ class PrivatemsgAPITestCase extends Drup
 
     $resultf1 = privatemsg_reply($thread_row['mid'], '', array('author' => $recipient2));
     $this->assertFalse($resultf1['success'], 'API denied to send message without body.');
-    $this->assertEqual($resultf1['messages']['error'][0], t('Disallowed to send reply without a message.'), 'Correct error returned when replying with an empty body.');
+    $this->assertEqual($resultf1['messages']['error'][0], t('A message must be included in your reply.'), 'Correct error returned when replying with an empty body.');
 
     $resultf2 = privatemsg_reply($thread_row['mid'], 'Test Body', array('author' => $recipient3));
-    $errormessage = 'User '. $recipient3->name .' is not allowed to write messages';
+    $errormessage = t('@user is not allowed to write messages.', array('@user' => $recipient3->name));
     $this->assertEqual($errormessage, $resultf2['messages']['error'][0], 'API denied to send message from user without permission');
 
   }