diff --git a/modules/contact/contact.pages.inc b/modules/contact/contact.pages.inc index 3f3e5a1d18332b8d8ddb84fbb895f4cb3260141c..ea467203fa043559a6e2d8d25ac229e849e166c2 100644 --- a/modules/contact/contact.pages.inc +++ b/modules/contact/contact.pages.inc @@ -92,7 +92,7 @@ function contact_site_form() { ); $form['submit'] = array( '#type' => 'submit', - '#value' => t('Send e-mail'), + '#value' => t('Send message'), ); return $form; @@ -197,7 +197,7 @@ function contact_personal_form(&$form_state, $recipient) { '#title' => t('Send yourself a copy.'), ); $form['submit'] = array('#type' => 'submit', - '#value' => t('Send e-mail'), + '#value' => t('Send message'), ); return $form; } @@ -229,7 +229,7 @@ function contact_personal_form_submit($form, &$form_state) { flood_register_event('contact'); watchdog('mail', '%name-from sent %name-to an e-mail.', array('%name-from' => $user->name, '%name-to' => $account->name)); - drupal_set_message(t('The message has been sent.')); + drupal_set_message(t('Your message has been sent.')); // Back to the requested users profile page. $form_state['redirect'] = "user/$account->uid"; diff --git a/modules/contact/contact.test b/modules/contact/contact.test index ecac2db1a2031113b6a6a3387e23df65700621ce..ef3ed0280da6d230900afc795d337ff64360381a 100644 --- a/modules/contact/contact.test +++ b/modules/contact/contact.test @@ -204,7 +204,7 @@ class ContactSitewideTestCase extends DrupalWebTestCase { $edit['subject'] = $subject; $edit['cid'] = $cid; $edit['message'] = $message; - $this->drupalPost('contact', $edit, t('Send e-mail')); + $this->drupalPost('contact', $edit, t('Send message')); } /** @@ -299,8 +299,8 @@ class ContactPersonalTestCase extends DrupalWebTestCase { $edit = array(); $edit['subject'] = $this->randomName(16); $edit['message'] = $this->randomName(64); - $this->drupalPost(NULL, $edit, t('Send e-mail')); - $this->assertText(t('The message has been sent.'), t('Message sent.')); + $this->drupalPost(NULL, $edit, t('Send message')); + $this->assertText(t('Your message has been sent.'), t('Message sent.')); // Clear flood table in preparation for flood test and allow other checks to complete. db_delete('flood')->execute(); @@ -310,8 +310,8 @@ class ContactPersonalTestCase extends DrupalWebTestCase { // Submit contact form with correct values and check flood interval. for ($i = 0; $i < $flood_control; $i++) { $this->drupalGet('user/' . $web_user2->uid . '/contact'); - $this->drupalPost(NULL, $edit, t('Send e-mail')); - $this->assertText(t('The message has been sent.'), t('Message sent.')); + $this->drupalPost(NULL, $edit, t('Send message')); + $this->assertText(t('Your message has been sent.'), t('Message sent.')); } // Submit contact form one over limit.