'. t('The contact module enables the use of both personal and site-wide contact forms, thereby facilitating easy communication within the community. While personal contact forms allow users to contact each other by e-mail, site-wide forms allow community members to contact the site administration from a central location. Users can specify a subject and message in the contact form, and also request that a copy of the e-mail be sent to their own address.') .'
'; + $output = ''. t('The contact module enables a Contact us form, and the use of personal contact forms for users, thereby facilitating easy communication within the community. Personal contact forms allow users to contact each other by e-mail. The Contact us from allows users to contact the site administration from a central location. Users can specify a subject and message in the contact form, and also request that a copy of the e-mail be sent to their own address.') .'
'; $output .= ''. t("Users can activate/deactivate their personal contact forms in their account settings. Upon activation, a contact tab will appear in their user profiles. Privileged users such as site administrators are able to contact users even if they have chosen not to enable this feature.") .'
'; $output .= ''. t("Note that the contact tab will not appear when a user views his or her own profile; only when viewing another user's profile, if that user's contact form is enabled.") .'
'; - $output .= ''. t('If the menu module is enabled, a menu item linking to the site-wide contact page is added to the navigation block. It is disabled by default, but can be enabled via the menu management page. Links to the contact page may also be added to the primary and secondary links using the same page.', array('@menu-module' => url('admin/build/menu'))) .'
'; - $output .= ''. t('For more information, please read the configuration and customization handbook page for the contact module.', array('@contact' => url('http://drupal.org/handbook/modules/contact/', array('absolute' => TRUE)))) .'
'; + $output .= ''. t('If the menu module is enabled, a menu item linking to the Contact us form is added to the navigation block. It is disabled by default, but can be enabled via the menu management page. Links to the contact page may also be added to the primary and secondary links using the same page.', array('@menu-module' => url('admin/build/menu'))) .'
'; + $output .= ''. t('For more information, please read the handbook page for the contact module.', array('@contact' => url('http://drupal.org/handbook/modules/contact/', array('absolute' => TRUE)))) .'
'; return $output; case 'admin/build/contact': - $output = ''. t('This page lets you set up your site-wide contact form. To do so, add one or more categories. You can associate different recipients with each category to route e-mails to different people. For example, you can route website feedback to the webmaster and direct product information requests to the sales department. On the settings page, you can customize the information shown above the contact form. This can be useful to provide additional contact information such as your postal address and telephone number.', array('@settings' => url('admin/build/contact/settings'), '@form' => url('contact'))) .'
'; + $output = ''. t('This page lets you set up your Contact us form. To do so, add one or more categories. You can associate different recipients with each category to route e-mails to different people. For example, you can route website feedback to the webmaster and direct product information requests to the sales department. On the settings page, you can customize the information shown above the contact form. This can be useful to provide additional contact information such as your postal address and telephone number.', array('@settings' => url('admin/build/contact/settings'), '@form' => url('contact'))) .'
'; if (!module_exists('menu')) { $menu_note = t('The menu item can be customized and configured only once the menu module has been enabled.', array('@modules-page' => url('admin/settings/modules'))); } @@ -43,7 +43,7 @@ function contact_menu() { $items['admin/build/contact'] = array( 'title' => 'Contact form', - 'description' => 'Create a system contact form and set up categories for the form to use.', + 'description' => 'Create a Contact us form and set up categories for the form to use.', 'page callback' => 'contact_admin_categories', 'access arguments' => array('administer site-wide contact form'), 'file' => 'contact.admin.inc', Index: modules/contact/contact.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/contact/contact.pages.inc,v retrieving revision 1.5 diff -u -r1.5 contact.pages.inc --- modules/contact/contact.pages.inc 10 Dec 2007 10:38:00 -0000 1.5 +++ modules/contact/contact.pages.inc 10 Dec 2007 10:53:09 -0000 @@ -6,9 +6,8 @@ * User page callbacks for the contact module. */ - /** - * Site-wide contact page. + * 'Contact us' page. */ function contact_site_page() { global $user; @@ -99,7 +98,7 @@ } /** - * Validate the site-wide contact page form submission. + * Validate the 'Contact us' form submission. */ function contact_mail_page_validate($form, &$form_state) { if (!$form_state['values']['cid']) { @@ -111,7 +110,7 @@ } /** - * Process the site-wide contact page form submission. + * Process the 'Contact us' form submission. */ function contact_mail_page_submit($form, &$form_state) { global $language;