Index: notifications.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/notifications/notifications.admin.inc,v retrieving revision 1.5.2.6.2.13 diff -u -p -r1.5.2.6.2.13 notifications.admin.inc --- notifications.admin.inc 9 Nov 2008 19:35:33 -0000 1.5.2.6.2.13 +++ notifications.admin.inc 28 Nov 2008 19:20:34 -0000 @@ -20,7 +20,7 @@ function notifications_settings_form() { '#title' => t('Immediate sending'), '#type' => 'checkbox', '#default_value' => variable_get('notifications_send_immediate', 0), - '#description' => t('Notifications are usually queued to be sent on cron process later. Checking this option will cause inmediate notifications to be sent right away, instead of being queued. This will produce more timely notifications for sites with a small number of users. Not recommended for sites with a large number of users.'), + '#description' => t('Notifications are usually queued to be sent on cron process later. Checking this option will cause immediate notifications to be sent right away, instead of being queued. This will produce more timely notifications for sites with a small number of users. Not recommended for sites with a large number of users.'), ); $form['sub_settings']['notifications_sender'] = array( '#title' => t('Notifications Sender'), @@ -397,9 +397,9 @@ function notifications_queue_operations( 'callback' => 'notifications_process_run', 'callback arguments' => array(FALSE), ), - 'inmediate' => array( - 'label' => t('Process inmediate'), - 'description' => t('Process only rows marked for inmediate sending.'), + 'immediate' => array( + 'label' => t('Process immediate'), + 'description' => t('Process only rows marked for immediate sending.'), 'callback' => 'notifications_process_rows', 'callback arguments' => array(array('cron' => 1, 'send_interval' => 0)), ), Index: notifications.cron.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/notifications/notifications.cron.inc,v retrieving revision 1.6.2.6.2.9 diff -u -p -r1.6.2.6.2.9 notifications.cron.inc --- notifications.cron.inc 9 Nov 2008 19:35:33 -0000 1.6.2.6.2.9 +++ notifications.cron.inc 28 Nov 2008 19:20:34 -0000 @@ -72,7 +72,7 @@ function notifications_process_prepare($ db_query("DELETE FROM {notifications_event} WHERE created < %d AND eid < (SELECT MIN(eid) FROM {notifications_queue})", $expiretime); // This will get the latest notification in queue so we don't mess with new ones being created during cron run - // It will also prevent clashes with the inmediate sending feature + // It will also prevent clashes with the immediate sending feature return db_result(db_query("SELECT max(sqid) FROM {notifications_queue}")); } Index: notifications.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/notifications/notifications.install,v retrieving revision 1.4.2.5.2.2 diff -u -p -r1.4.2.5.2.2 notifications.install --- notifications.install 17 Sep 2008 18:25:04 -0000 1.4.2.5.2.2 +++ notifications.install 28 Nov 2008 19:20:34 -0000 @@ -84,7 +84,7 @@ function notifications_install() { */ function notifications_uninstall() { drupal_uninstall_schema('notifications'); - foreach (array('events', 'send_intervals', 'sender', 'sendself', 'send_inmediate') as $name) { + foreach (array('events', 'send_intervals', 'sender', 'sendself', 'send_immediate') as $name) { variable_del("notifications_$name"); } } Index: notifications.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/notifications/notifications.module,v retrieving revision 1.6.2.9.2.23 diff -u -p -r1.6.2.9.2.23 notifications.module --- notifications.module 9 Nov 2008 19:35:33 -0000 1.6.2.9.2.23 +++ notifications.module 28 Nov 2008 19:20:35 -0000 @@ -327,7 +327,7 @@ function notifications_event($event) { * Event array. */ function notifications_queue($event) { - global $notifications_send_inmediate; + global $notifications_send_immediate; // Build query fields for this event type. If no arguments retrieved, skip this step if ($query_args = notifications_module_information('query', 'event', $event->type, $event)) { @@ -358,22 +358,22 @@ function notifications_queue($event) { // If immediate sending enabled, store eid for sending on page exit. if (variable_get('notifications_send_immediate', 0)) { - $notifications_send_inmediate[] = $event->eid; + $notifications_send_immediate[] = $event->eid; } } /** * Implementation of hook_exit() * - * This is where the inmediate sending is done if enabled, so we are sure all other modules + * This is where the immediate sending is done if enabled, so we are sure all other modules * have finished node processing when node update. */ function notifications_exit() { - global $notifications_send_inmediate; + global $notifications_send_immediate; - if (!empty($notifications_send_inmediate)) { + if (!empty($notifications_send_immediate)) { require_once drupal_get_path('module', 'notifications') .'/notifications.cron.inc'; - foreach ($notifications_send_inmediate as $eid) { + foreach ($notifications_send_immediate as $eid) { notifications_process_rows(array('cron' => 1, 'eid' => $eid, 'send_interval' => 0)); } } Index: notifications_content/notifications_content.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/notifications/notifications_content/notifications_content.module,v retrieving revision 1.4.2.9.2.15 diff -u -p -r1.4.2.9.2.15 notifications_content.module --- notifications_content/notifications_content.module 7 Nov 2008 23:43:49 -0000 1.4.2.9.2.15 +++ notifications_content/notifications_content.module 28 Nov 2008 19:20:35 -0000 @@ -472,7 +472,7 @@ function notifications_content_nodeapi(& if ($node->status == '0') { // unpublished break; // don't notify } - // If inmediate sending is active, need to reset the node cache so we don't send old versions of the node + // If immediate sending is active, need to reset the node cache so we don't send old versions of the node if (variable_get('notifications_send_immediate', 0)) { node_load(0, NULL, TRUE); } Index: notifications_lite/notifications_lite.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/notifications/notifications_lite/Attic/notifications_lite.module,v retrieving revision 1.1.4.4 diff -u -p -r1.1.4.4 notifications_lite.module --- notifications_lite/notifications_lite.module 7 Nov 2008 16:47:08 -0000 1.1.4.4 +++ notifications_lite/notifications_lite.module 28 Nov 2008 19:20:35 -0000 @@ -122,7 +122,7 @@ function notifications_lite_notification } } break; - // By queueing the event here we gain access to some features, like inmediate sending + // By queueing the event here we gain access to some features, like immediate sending case 'event queued': // $event is arg0 $event = &$arg0; if ($event->type == 'lite') { Index: tests/notifications_content.test =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/notifications/tests/Attic/notifications_content.test,v retrieving revision 1.1.2.4 diff -u -p -r1.1.2.4 notifications_content.test --- tests/notifications_content.test 20 Sep 2008 15:43:30 -0000 1.1.2.4 +++ tests/notifications_content.test 28 Nov 2008 19:20:35 -0000 @@ -19,7 +19,7 @@ class NotificationsContentTests extends function setUp() { parent::setUp('messaging', 'messaging_debug', 'notifications', 'notifications_content', 'notifications_ui'); // Set some defaults - // Default send interval will be: Inmediately + // Default send interval will be: immediately variable_set('notifications_default_send_interval', 0); variable_set('notifications_default_send_method', 'debug'); } Index: tests/notifications_templates.test =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/notifications/tests/Attic/notifications_templates.test,v retrieving revision 1.1.4.2 diff -u -p -r1.1.4.2 notifications_templates.test --- tests/notifications_templates.test 7 Nov 2008 23:11:39 -0000 1.1.4.2 +++ tests/notifications_templates.test 28 Nov 2008 19:20:35 -0000 @@ -16,7 +16,7 @@ class NotificationsTemplatesTests extend function setUp() { parent::setUp('messaging', 'messaging_debug', 'token', 'notifications', 'notifications_content'); // Set some defaults - // Default send interval will be: Inmediately + // Default send interval will be: immediately variable_set('notifications_default_send_interval', 0); variable_set('notifications_default_send_method', 'debug'); // Set fake site name for comparison after token replacement