', '#suffix' => '
', '#markup' => t('This form allows you to convert rules or rule sets from Rules 1.x to Rules 2.x.') . ' ' . - t('In order to convert a rule or rule set make sure you have all dependend modules installed and upgraded, i.e. modules which provide Rules integration that has been used in your rules or rule sets. In addition those modules may need to implement some Rules specific update hooks for the conversion to properly work.') . ' ' . + t('In order to convert a rule or rule set make sure you have all dependent modules installed and upgraded, i.e. modules which provide Rules integration that has been used in your rules or rule sets. In addition those modules may need to implement some Rules specific update hooks for the conversion to properly work.') . ' ' . t('After conversion, the old rules and rule sets will stay in the database until you manually delete them. That way you can make sure the conversion has gone right before you delete the old rules and rule sets.') ); @@ -557,7 +557,7 @@ function rules_action_save_variable_upgrade($element, $target) { // System.module integration. function rules_action_set_breadcrumb_upgrade_map_name($element) { - return 'breadcumb_set'; + return 'breadcrumb_set'; } function rules_action_mail_to_user_upgrade_map_name($element) { return 'mail'; diff --git a/modules/php.eval.inc b/modules/php.eval.inc index 9e70546..ac35cf3 100644 --- a/modules/php.eval.inc +++ b/modules/php.eval.inc @@ -108,7 +108,7 @@ function rules_execute_php_eval($code, $settings, $state, $element) { } /** - * Evalutes the given PHP code, with the given variables defined. + * Evaluates the given PHP code, with the given variables defined. * * @param $code * The PHP code to run, with @@ -130,7 +130,7 @@ function rules_php_eval($code, $arguments = array()) { } /** - * Evalutes the given PHP code, with the given variables defined. This is like + * Evaluates the given PHP code, with the given variables defined. This is like * rules_php_eval() but does return the returned data from the PHP code. * * @param $code diff --git a/modules/rules_core.eval.inc b/modules/rules_core.eval.inc index 2738c9f..55fba1a 100644 --- a/modules/rules_core.eval.inc +++ b/modules/rules_core.eval.inc @@ -46,7 +46,7 @@ function rules_element_invoke_component($arguments, RulesPlugin $element) { $state->mergeSaveVariables($new_state, $component, $element->settings); $state->unblock($component); - // Cleanup the state, what saves not mergable variables now. + // Cleanup the state, what saves not mergeable variables now. $new_state->cleanup(); rules_log('Finished evaluation of @plugin %label.', $replacements, RulesLog::INFO, $component, FALSE); return $return; @@ -231,7 +231,7 @@ class RulesTaxonomyVocabularyWrapper extends EntityDrupalWrapper { } /** - * Overriden to permit machine names as values. + * Overridden to permit machine names as values. */ public function validate($value) { if (isset($value) && is_string($value)) { diff --git a/modules/system.eval.inc b/modules/system.eval.inc index 0de887c..808ff22 100644 --- a/modules/system.eval.inc +++ b/modules/system.eval.inc @@ -43,7 +43,7 @@ function rules_action_drupal_goto($url, $force = FALSE, $destination = FALSE) { unset($_GET['destination']); } // We don't invoke drupal_goto() right now, as this would end the the current - // page execution unpredictly for modules. So we'll take over drupal_goto() + // page execution unpredictably for modules. So we'll take over drupal_goto() // calls from somewhere else via hook_drupal_goto_alter() and make sure // a drupal_goto() is invoked before the page is output with // rules_page_build(). @@ -125,7 +125,7 @@ function rules_action_mail_to_users_of_role($roles, $subject, $message, $from = $message = drupal_mail('rules', $key, $row->mail, language_default(), $params, $from); // If $message['result'] is FALSE, then it's likely that email sending is // failing at the moment, and we should just abort sending any more. If - // however, $mesage['result'] is NULL, then it's likely that a module has + // however, $message['result'] is NULL, then it's likely that a module has // aborted sending this particular email to this particular user, and we // should just keep on sending emails to the other users. // For more information on the result value, see drupal_mail(). diff --git a/rules.api.php b/rules.api.php index cabe313..493c512 100644 --- a/rules.api.php +++ b/rules.api.php @@ -176,7 +176,7 @@ function hook_rules_action_info() { * - label: The label of the category. Start capitalized. Required. * - weight: (optional) A weight for sorting the category. Defaults to 0. * - equals group: (optional) For BC, categories may be defined that equal - * a previsouly used 'group'. + * a previously used 'group'. * - icon: (optional) The file path of an icon to use, relative to the module * or specified icon path. The icon should be a transparent SVG containing * no colors (only #fff). See https://drupal.org/node/2090265 for @@ -260,9 +260,9 @@ function hook_rules_directory() { * hook_rules_action_info() as well as an array containing the action's * configuration settings. * @return - * The action may return an array containg parameter or provided variables + * The action may return an array containing parameter or provided variables * with their names as key. This is used update the value of a parameter or to - * provdide the value for a provided variable. + * provide the value for a provided variable. * Apart from that any parameters which have the key 'save' set to TRUE will * be remembered to be saved by rules unless the action returns FALSE. * Conditions have to return a boolean value in any case. @@ -446,7 +446,7 @@ function hook_rules_event_info() { * makes use of the class for wrapping the data of the given type. However * note that if data is already wrapped when it is passed to Rules, the * existing wrappers will be kept. - * For modules implementing identifiable data types being non-entites the + * For modules implementing identifiable data types being non-entities the * class RulesIdentifiableDataWrapper is provided, which can be used as base * for a custom wrapper class. See RulesIdentifiableDataWrapper for details. * - property info: (optional) May be used for non-entity data structures to @@ -996,7 +996,7 @@ function hook_rules_action_base_upgrade_map_name($element) { * care of upgrading the configuration of all known parameters, which only works * if the parameter name has not changed. * If something changed, this callback can be used to properly apply the - * configruation of the Drupal 6 action ($element) to the Drupal 7 version + * configuration of the Drupal 6 action ($element) to the Drupal 7 version * ($target). * * This is no real hook, but a callback that is invoked for each Drupal 6 diff --git a/rules.features.inc b/rules.features.inc index d34c8d6..06355ed 100644 --- a/rules.features.inc +++ b/rules.features.inc @@ -35,7 +35,7 @@ class RulesFeaturesController extends EntityDefaultFeaturesController { $iterator = new RecursiveIteratorIterator($rules_config, RecursiveIteratorIterator::SELF_FIRST); foreach ($iterator as $element) { if ($element->facesAs('RulesPluginFeaturesIntegrationInterace')) { - // Directly use __call() so we cann pass $export by reference. + // Directly use __call() so we can pass $export by reference. $element->__call('features_export', array(&$export, &$pipe, $module_name)); } } diff --git a/rules.module b/rules.module index e3b65cd..13c0294 100644 --- a/rules.module +++ b/rules.module @@ -102,7 +102,7 @@ function rules_condition($name, $settings = array()) { * * @param $variables * The array of variables to setup in the evaluation state, making them - * available for the configuraion elements. Values for the variables need to + * available for the configuration elements. Values for the variables need to * be passed as argument when the rule is executed. Only Rule instances with * no variables can be embedded in other configurations, e.g. rule sets. * The array has to be keyed by variable name and contain a sub-array for each @@ -162,7 +162,7 @@ function rules_and($variables = NULL) { * The loop settings, containing * 'list:select': The data selector for the list to loop over. * 'item:var': Optionally a name for the list item variable. - * 'item:label': Optionally a lebel for the list item variable. + * 'item:label': Optionally a label for the list item variable. * @param $variables * An optional array as for rule(). * @return RulesLoop @@ -247,7 +247,7 @@ function rules_log($msg, $args = array(), $priority = RulesLog::INFO, RulesPlugi /** * Fetches module definitions for the given hook name. * - * Used for collecting events, rules, actions and condtions from other modules. + * Used for collecting events, rules, actions and condition from other modules. * * @param $hook * The hook of the definitions to get from invoking hook_rules_{$hook}. @@ -931,7 +931,7 @@ function rules_config_delete(array $ids) { */ function rules_config_update_dirty_flag($rules_config, $update = TRUE) { // Keep a log of already check configurations to avoid repetitive checks on - // oftent used components. + // often used components. // @see rules_element_invoke_component_validate() $checked = &drupal_static(__FUNCTION__, array()); if (!empty($checked[$rules_config->name])) { diff --git a/rules_i18n/rules_i18n.i18n.inc b/rules_i18n/rules_i18n.i18n.inc index 003540d..f97ec16 100644 --- a/rules_i18n/rules_i18n.i18n.inc +++ b/rules_i18n/rules_i18n.i18n.inc @@ -11,7 +11,7 @@ class RulesI18nStringController extends EntityDefaultI18nStringController { /** - * Overriden to customize i18n object info. + * Overridden to customize i18n object info. * * @see EntityDefaultI18nStringController::hook_object_info() */ @@ -22,7 +22,7 @@ class RulesI18nStringController extends EntityDefaultI18nStringController { } /** - * Overriden to customize the used menu wildcard. + * Overridden to customize the used menu wildcard. */ protected function menuWildcard() { return '%rules_config'; diff --git a/rules_i18n/rules_i18n.test b/rules_i18n/rules_i18n.test index 1cb7a0d..8f718af 100644 --- a/rules_i18n/rules_i18n.test +++ b/rules_i18n/rules_i18n.test @@ -139,7 +139,7 @@ class RulesI18nTestCase extends DrupalWebTestCase { $messages = drupal_get_messages(); $this->assertEqual($messages['status'][0], 'text-de', 'Text has been successfully translated.'); - // Enable the PHP module and make sure PHP in translations is not evaluted. + // Enable the PHP module and make sure PHP in translations is not evaluated. module_enable(array('php')); i18n_string_textgroup('rules')->update_translation("rules_config:{$set->name}:$id:text", 'de', 'text '); diff --git a/rules_scheduler/rules_scheduler.admin.inc b/rules_scheduler/rules_scheduler.admin.inc index 2956a47..cb5f399 100644 --- a/rules_scheduler/rules_scheduler.admin.inc +++ b/rules_scheduler/rules_scheduler.admin.inc @@ -116,7 +116,7 @@ function rules_scheduler_schedule_form($form, &$form_state, $rules_config, $base $form_state['component'] = $rules_config->name; $action = rules_action('schedule', array('component' => $rules_config->name)); $action->form($form, $form_state); - // The component should be fixed, so hide the paramter for it. + // The component should be fixed, so hide the parameter for it. $form['parameter']['component']['#access'] = FALSE; $form['submit'] = array( '#type' => 'submit', diff --git a/rules_scheduler/rules_scheduler.test b/rules_scheduler/rules_scheduler.test index 957ce0c..897fb23 100644 --- a/rules_scheduler/rules_scheduler.test +++ b/rules_scheduler/rules_scheduler.test @@ -59,7 +59,7 @@ class RulesSchedulerTestCase extends DrupalWebTestCase { } /** - * Make sure recurion prevention is working fine for scheduled rule sets. + * Make sure recursion prevention is working fine for scheduled rule sets. */ function testRecursionPrevention() { $set = rules_rule_set(array( diff --git a/tests/rules.test b/tests/rules.test index 3b034e8..d720fcc 100644 --- a/tests/rules.test +++ b/tests/rules.test @@ -168,7 +168,7 @@ class RulesTestCase extends DrupalWebTestCase { $action2->executeByArgs(array('node' => $node)); $this->assertEqual($node->status, 1, 'Action executed correctly'); - // Test calling an extended + overriden method. + // Test calling an extended + overridden method. $this->assertEqual($action2->help(), 'custom', 'Using custom help callback.'); // Inspect the cache @@ -388,7 +388,7 @@ class RulesTestCase extends DrupalWebTestCase { user_role_change_permissions($this->normal_role, array('use Rules component rules_test_roles' => TRUE)); $this->assertTrue(rules_action('component_rules_test_roles')->access(), 'Authenticated user with the correct role can use the rule component.'); - // Reset global user to anonyous. + // Reset global user to anonymous. $user = user_load(0); $this->assertFalse(rules_action('component_rules_test_roles')->access(), 'Anonymous user can\'t use the rule component.'); } @@ -1221,7 +1221,7 @@ class RulesTriggerTestCase extends DrupalWebTestCase { /** * Ensure the recursion prevention still allows to let the rule trigger again * during evaluation of the same event set, if the event isn't caused by the - * rule itself - thus we won't run in an infinte loop. + * rule itself - thus we won't run in an infinite loop. */ function testRecursionOnDifferentArguments() { // Create rule1 - which might recurse. @@ -1396,7 +1396,7 @@ class RulesIntegrationTestCase extends DrupalWebTestCase { $node = $this->drupalCreateNode(array('title' => 'foo')); $rule->execute($node); - $this->assertEqual($node->title, 'bar', "Data comparision using IN operation evaluates to TRUE."); + $this->assertEqual($node->title, 'bar', "Data comparison using IN operation evaluates to TRUE."); // Test Condition: Data is empty. @@ -1468,7 +1468,7 @@ class RulesIntegrationTestCase extends DrupalWebTestCase { $set->action('data_convert', array('type' => 'integer', 'value:select' => 'source', 'rounding_behavior' => 'down')); $set->action('data_set', array('data:select' => 'result', 'value:select' => 'conversion_result')); list($result) = $set->execute('9.6'); - $this->assertEqual($result, 9, 'Converted decimal to integer using roundin behavio down.'); + $this->assertEqual($result, 9, 'Converted decimal to integer using rounding behavior down.'); $set = rules_action_set(array( 'result' => array('type' => 'integer', 'parameter' => FALSE), @@ -1510,7 +1510,7 @@ class RulesIntegrationTestCase extends DrupalWebTestCase { ->execute(entity_metadata_wrapper('node', $article), 'field_tags'); $this->assertTrue($result); - // Test entiy_is_of_bundle condition. + // Test entity_is_of_bundle condition. $result = rules_condition('entity_is_of_bundle', array( 'type' => 'node', 'bundle' => array('article'), @@ -1983,7 +1983,7 @@ class RulesIntegrationTestCase extends DrupalWebTestCase { // custom role and a user for it. $user = $this->drupalCreateUser(array('administer nodes')); $roles = $user->roles; - // Remove the authenticate role so we only use the new role created by + // Remove the authenticated role so we only use the new role created by // drupalCreateUser(). unset($roles[DRUPAL_AUTHENTICATED_RID]); rules_action('mail_to_users_of_role', $settings + array('roles' => array_keys($roles)))->execute(); diff --git a/ui/rules.autocomplete.js b/ui/rules.autocomplete.js index 09ce1c5..a6ac993 100644 --- a/ui/rules.autocomplete.js +++ b/ui/rules.autocomplete.js @@ -81,7 +81,7 @@ Drupal.rules = Drupal.rules || {}; this.jqObject.bind("autocompleteselect", function(event, ui) { // If a group was selected then set the groupSelected to true for the - // overriden close function from jquery autocomplete. + // overridden close function from jquery autocomplete. if (ui.item.value.substring(ui.item.value.length - 1, ui.item.value.length) == ":") { instance.groupSelected = true; } @@ -180,7 +180,7 @@ Drupal.rules = Drupal.rules || {}; }; /** - * Toogle the autcomplete window. + * Toggle the autocomplete window. */ Drupal.rules.autocomplete.prototype.toggle = function() { if (this.jqObject.autocomplete("widget").is(":visible")) { diff --git a/ui/rules.ui.css b/ui/rules.ui.css index b567051..5c90100 100644 --- a/ui/rules.ui.css +++ b/ui/rules.ui.css @@ -86,7 +86,7 @@ ul.rules-operations-add li { position: relative; cursor: pointer; - /* The span element with the icon which opens the log, has a whitepsace. + /* The span element with the icon which opens the log, has a whitespace. Since we don't want the user to mark this white space, we prevent this using the this code.*/ -moz-user-select: -moz-none; diff --git a/ui/ui.controller.inc b/ui/ui.controller.inc index e502b0d..99269d5 100644 --- a/ui/ui.controller.inc +++ b/ui/ui.controller.inc @@ -35,8 +35,8 @@ class RulesUIController { ); $items[$base_path . '/manage/%rules_config/add/%rules_element'] = array( // Adding another part to the path would hit the menu path-part-limit - // for base paths like admin/config/workflow/rules. Therefor we have to - // use this fugly way for setting the title. + // for base paths like admin/config/workflow/rules. Therefore we have to + // use this ugly way for setting the title. 'title callback' => 'rules_menu_add_element_title', // Wrap the integer in an array, so it is passed as is. 'title arguments' => array(array($base_count + 4)), @@ -157,8 +157,8 @@ class RulesUIController { } /** - * Generates the render array for a overview configuration table for arbitrary - * rule configs that match the given conditions. + * Generates the render array for an overview configuration table for + * arbitrary rule configs that match the given conditions. * * Note: The generated overview table contains multiple links for editing the * rule configurations. For the links to properly work use diff --git a/ui/ui.core.inc b/ui/ui.core.inc index a51c6af..063d198 100644 --- a/ui/ui.core.inc +++ b/ui/ui.core.inc @@ -257,7 +257,7 @@ class RulesPluginUI extends FacesExtender implements RulesPluginUIInterface { ); } if (!empty($form['provides'])) { - $help = '