From 71ee49de3eba0639d13a5861803f1cf031f376df Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Sat, 9 Jan 2010 23:03:22 +0000
Subject: #679890 follow-up by Bojhan, aspilicious, and agentrickard: Remove
 more extraneous 'Please' in the interface.

---
 modules/contact/contact.pages.inc | 4 ++--
 modules/contact/contact.test      | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'modules/contact')

diff --git a/modules/contact/contact.pages.inc b/modules/contact/contact.pages.inc
index 17e1bf1bc..9059749e9 100644
--- a/modules/contact/contact.pages.inc
+++ b/modules/contact/contact.pages.inc
@@ -19,7 +19,7 @@ function contact_site_form($form, &$form_state) {
   $limit = variable_get('contact_threshold_limit', 5);
   $window = variable_get('contact_threshold_window', 3600);
   if (!flood_is_allowed('contact', $limit, $window) && !user_access('administer contact forms')) {
-    drupal_set_message(t("You cannot send more than %limit messages in @interval. Please try again later.", array('%limit' => $limit, '@interval' => format_interval($window))), 'error');
+    drupal_set_message(t("You cannot send more than %limit messages in @interval. Try again later.", array('%limit' => $limit, '@interval' => format_interval($window))), 'error');
     drupal_access_denied();
     drupal_exit();
   }
@@ -178,7 +178,7 @@ function contact_personal_form($form, &$form_state, $recipient) {
   $limit = variable_get('contact_threshold_limit', 5);
   $window = variable_get('contact_threshold_window', 3600);
   if (!flood_is_allowed('contact', $limit, $window) && !user_access('administer contact forms') && !user_access('administer users')) {
-    drupal_set_message(t("You cannot send more than %limit messages in @interval. Please try again later.", array('%limit' => $limit, '@interval' => format_interval($window))), 'error');
+    drupal_set_message(t("You cannot send more than %limit messages in @interval. Try again later.", array('%limit' => $limit, '@interval' => format_interval($window))), 'error');
     drupal_access_denied();
     drupal_exit();
   }
diff --git a/modules/contact/contact.test b/modules/contact/contact.test
index 3b6f90a82..02adc9709 100644
--- a/modules/contact/contact.test
+++ b/modules/contact/contact.test
@@ -145,7 +145,7 @@ class ContactSitewideTestCase extends DrupalWebTestCase {
     // Submit contact form one over limit.
     $this->drupalGet('contact');
     $this->assertResponse(403, t('Access denied to anonymous user after reaching message treshold.'));
-    $this->assertRaw(t('You cannot send more than %number messages in @interval. Please try again later.', array('%number' => variable_get('contact_threshold_limit', 3), '@interval' => format_interval(600))), t('Message threshold reached.'));
+    $this->assertRaw(t('You cannot send more than %number messages in @interval. Try again later.', array('%number' => variable_get('contact_threshold_limit', 3), '@interval' => format_interval(600))), t('Message threshold reached.'));
 
     // Delete created categories.
     $this->drupalLogin($admin_user);
@@ -371,12 +371,12 @@ class ContactPersonalTestCase extends DrupalWebTestCase {
 
     // Submit contact form one over limit.
     $this->drupalGet('user/' . $this->contact_user->uid. '/contact');
-    $this->assertRaw(t('You cannot send more than %number messages in @interval. Please try again later.', array('%number' => $flood_limit, '@interval' => format_interval(variable_get('contact_threshold_window', 3600)))), 'Normal user denied access to flooded contact form.');
+    $this->assertRaw(t('You cannot send more than %number messages in @interval. Try again later.', array('%number' => $flood_limit, '@interval' => format_interval(variable_get('contact_threshold_window', 3600)))), 'Normal user denied access to flooded contact form.');
 
     // Test that the admin user can still access the contact form even though
     // the flood limit was reached.
     $this->drupalLogin($this->admin_user);
-    $this->assertNoText('Please try again later.', 'Admin user not denied access to flooded contact form.');
+    $this->assertNoText('Try again later.', 'Admin user not denied access to flooded contact form.');
   }
 
   /**
-- 
cgit v1.2.3