Commit b9b0063a authored by Dries's avatar Dries
Browse files

- Patch #453572 by Xano: improve language.

parent 1eb38eed
...@@ -92,7 +92,7 @@ function contact_site_form() { ...@@ -92,7 +92,7 @@ function contact_site_form() {
); );
$form['submit'] = array( $form['submit'] = array(
'#type' => 'submit', '#type' => 'submit',
'#value' => t('Send e-mail'), '#value' => t('Send message'),
); );
return $form; return $form;
...@@ -197,7 +197,7 @@ function contact_personal_form(&$form_state, $recipient) { ...@@ -197,7 +197,7 @@ function contact_personal_form(&$form_state, $recipient) {
'#title' => t('Send yourself a copy.'), '#title' => t('Send yourself a copy.'),
); );
$form['submit'] = array('#type' => 'submit', $form['submit'] = array('#type' => 'submit',
'#value' => t('Send e-mail'), '#value' => t('Send message'),
); );
return $form; return $form;
} }
...@@ -229,7 +229,7 @@ function contact_personal_form_submit($form, &$form_state) { ...@@ -229,7 +229,7 @@ function contact_personal_form_submit($form, &$form_state) {
flood_register_event('contact'); flood_register_event('contact');
watchdog('mail', '%name-from sent %name-to an e-mail.', array('%name-from' => $user->name, '%name-to' => $account->name)); 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. // Back to the requested users profile page.
$form_state['redirect'] = "user/$account->uid"; $form_state['redirect'] = "user/$account->uid";
......
...@@ -204,7 +204,7 @@ class ContactSitewideTestCase extends DrupalWebTestCase { ...@@ -204,7 +204,7 @@ class ContactSitewideTestCase extends DrupalWebTestCase {
$edit['subject'] = $subject; $edit['subject'] = $subject;
$edit['cid'] = $cid; $edit['cid'] = $cid;
$edit['message'] = $message; $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 { ...@@ -299,8 +299,8 @@ class ContactPersonalTestCase extends DrupalWebTestCase {
$edit = array(); $edit = array();
$edit['subject'] = $this->randomName(16); $edit['subject'] = $this->randomName(16);
$edit['message'] = $this->randomName(64); $edit['message'] = $this->randomName(64);
$this->drupalPost(NULL, $edit, t('Send e-mail')); $this->drupalPost(NULL, $edit, t('Send message'));
$this->assertText(t('The message has been sent.'), t('Message sent.')); $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. // Clear flood table in preparation for flood test and allow other checks to complete.
db_delete('flood')->execute(); db_delete('flood')->execute();
...@@ -310,8 +310,8 @@ class ContactPersonalTestCase extends DrupalWebTestCase { ...@@ -310,8 +310,8 @@ class ContactPersonalTestCase extends DrupalWebTestCase {
// Submit contact form with correct values and check flood interval. // Submit contact form with correct values and check flood interval.
for ($i = 0; $i < $flood_control; $i++) { for ($i = 0; $i < $flood_control; $i++) {
$this->drupalGet('user/' . $web_user2->uid . '/contact'); $this->drupalGet('user/' . $web_user2->uid . '/contact');
$this->drupalPost(NULL, $edit, t('Send e-mail')); $this->drupalPost(NULL, $edit, t('Send message'));
$this->assertText(t('The message has been sent.'), t('Message sent.')); $this->assertText(t('Your message has been sent.'), t('Message sent.'));
} }
// Submit contact form one over limit. // Submit contact form one over limit.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment