diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index 2b3a14276bd..d0b3a622650 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -2790,7 +2790,7 @@ function system_actions_manage() { if (!empty($pager)) { $row[] = array(array('data' => $pager, 'colspan' => '3')); } - $build['system_actions_header'] = array('#markup' => '

' . t('Actions available to Drupal:') . '

'); + $build['system_actions_header'] = array('#markup' => '

' . t('Available actions:') . '

'); $build['system_actions_table'] = array('#markup' => theme('table', array('header' => $header, 'rows' => $row))); } @@ -2817,7 +2817,7 @@ function system_actions_manage() { function system_actions_manage_form($form, &$form_state, $options = array()) { $form['parent'] = array( '#type' => 'fieldset', - '#title' => t('Make a new advanced action available'), + '#title' => t('Create an advanced action'), '#prefix' => '
', '#suffix' => '
', ); diff --git a/modules/system/system.module b/modules/system/system.module index 50a426dcf5c..235136c0c4a 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -123,7 +123,7 @@ function system_help($path, $arg) { case 'admin/config/system/actions': case 'admin/config/system/actions/manage': $output = ''; - $output .= '

' . t('There are two types of actions: simple and advanced. Simple actions do not require any additional configuration, and are listed here automatically. Advanced actions can do more than simple actions; for example, send an e-mail to a specified address, or check for certain words within a piece of content. These actions need to be created and configured first before they may be used. To create an advanced action, select the action from the drop-down list in the advanced action section below and click the Create button.') . '

'; + $output .= '

' . t('There are two types of actions: simple and advanced. Simple actions do not require any additional configuration, and are listed here automatically. Advanced actions need to be created and configured before they can be used, because they have options that need to be specified; for example, sending an e-mail to a specified address, or unpublishing content containing certain words. To create an advanced action, select the action from the drop-down list in the advanced action section below and click the Create button.') . '

'; if (module_exists('trigger')) { $output .= '

' . t('You may proceed to the Triggers page to assign these actions to system events.', array('@url' => url('admin/structure/trigger'))) . '

'; } diff --git a/modules/trigger/trigger.module b/modules/trigger/trigger.module index 975842c41c6..939218fcd56 100644 --- a/modules/trigger/trigger.module +++ b/modules/trigger/trigger.module @@ -11,7 +11,7 @@ * Implements hook_help(). */ function trigger_help($path, $arg) { - $explanation = '

' . t('Triggers are system events, such as when new content is added or when a user logs in. The trigger module associates these triggers with actions (functional tasks), such as unpublishing content or e-mailing an administrator. The Actions settings page contains a list of existing actions and provides the ability to create and configure additional actions.', array('@url' => url('admin/config/system/actions'))) . '

'; + $explanation = '

' . t('Triggers are events on your site, such as new content being added or a user logging in. The Trigger module associates these triggers with actions (functional tasks), such as unpublishing content containing certain keywords or e-mailing an administrator. The Actions settings page contains a list of existing actions and provides the ability to create and configure advanced actions (actions requiring configuration, such as an e-mail address or a list of banned words).', array('@url' => url('admin/config/system/actions'))) . '

'; switch ($path) { case 'admin/structure/trigger/comment': return $explanation . '

' . t('Below you can assign actions to run when certain comment-related triggers happen. For example, you could promote a post to the front page when a comment is added.') . '

'; @@ -27,11 +27,11 @@ function trigger_help($path, $arg) { case 'admin/help#trigger': $output = ''; $output .= '

' . t('About') . '

'; - $output .= '

' . t('The Trigger module provides the ability to trigger actions upon system events, such as when new content is added or when a user logs in. For more information, see the online handbook entry for Trigger module.', array('@trigger' => 'http://drupal.org/handbook/modules/trigger/')) . '

'; + $output .= '

' . t('The Trigger module provides the ability to cause actions to run when certain triggers take place on your site. Triggers are events, such as new content being added to your site or a user logging in, and actions are tasks, such as unpublishing content or e-mailing an administrator. For more information, see the online handbook entry for Trigger module.', array('@trigger' => 'http://drupal.org/handbook/modules/trigger/')) . '

'; $output .= '

' . t('Uses') . '

'; $output .= '
'; - $output .= '
' . t('Configuring triggers') . '
'; - $output .= '
' . t('The combination of actions and triggers can perform many useful tasks, such as e-mailing an administrator if a user account is deleted, or automatically unpublishing comments that contain certain words. By default, there are five contexts of events (Comments, Content, Cron, Taxonomy, and Users), but more may be added by additional modules. Users with the appropriate permissions can configure triggers on the Triggers configuration page, and actions on the Actions configuration page.', array('@triggers-page' => url('admin/structure/trigger'), '@actions-page' => url('admin/config/system/actions'))) . '
'; + $output .= '
' . t('Configuring triggers and actions') . '
'; + $output .= '
' . t('The combination of actions and triggers can perform many useful tasks, such as e-mailing an administrator if a user account is deleted, or automatically unpublishing comments that contain certain words. To set up a trigger/action combination, first visit the Actions configuration page, where you can either verify that the action you want is already listed, or create a new advanced action. You will need to set up an advanced action if there are configuration options in your trigger/action combination, such as specifying an e-mail address or a list of banned words. After configuring or verifying your action, visit the Triggers configuration page and choose the appropriate tab (Comment, Taxonomy, etc.), where you can assign the action to run when the trigger event occurs.', array('@triggers-page' => url('admin/structure/trigger'), '@actions-page' => url('admin/config/system/actions'))) . '
'; $output .= '
'; return $output; }