--- /f/projects/drupal/cvs-head/contributions/modules/eventrepeat/eventrepeat.module 2006-07-28 16:43:54.671875000 -0400 +++ modules/eventrepeat/eventrepeat.module 2006-07-28 16:45:06.250000000 -0400 @@ -343,16 +343,16 @@ function eventrepeat_form_alter($form_id if ($node->eventrepeat_rid) { //create the option array - $options = array('this' => t('This occurance only'), - 'future' => t('This occurance and all future occurances'), - 'all' => t('All occurances') + $options = array('this' => t('This occurrence only'), + 'future' => t('This occurrence and all future occurrences'), + 'all' => t('All occurrences') ); //construct the radio buttons. NOTE: in order to prevent name collisions in the admin //delete process for multiple nodes, these form elements are named in array fashion, with nid to distinguish //the elements of the array $form['eventrepeat_delete_type']['#tree'] = TRUE; - $form['eventrepeat_delete_type'][$node->nid] = array('#type' => 'radios', '#title' => t('Repeat event--delete the following'), '#default_value' => 'this', '#options' => $options, '#description' => t('\'This occurance and all future occurances\' will delete repeat events from the date of the selected node forward, \'All occurances\' will delete repeat events after today\'s date.')); + $form['eventrepeat_delete_type'][$node->nid] = array('#type' => 'radios', '#title' => t('Repeat event--delete the following'), '#default_value' => 'this', '#options' => $options, '#description' => t('\'This occurrence and all future occurrences\' will delete repeat events from the date of the selected node forward, \'All occurrences\' will delete repeat events after today\'s date.')); } //inject node type settings checkbox for repeat events @@ -362,7 +362,7 @@ function eventrepeat_form_alter($form_id '#type' => 'checkbox', '#title' => t('Allow repeat events'), '#default_value' => variable_get("eventrepeat_nodeapi_$type", FALSE) == 1, - '#description' => t('if selected, users will be allowed to add repeating events for this node type'), + '#description' => t('If selected, users will be allowed to add repeating events for this node type'), ); //inject the appropriate repeat data into the node form if the node type is repeat enabled @@ -572,16 +572,16 @@ function eventrepeat_nodeapi(&$node, $op (variable_get('eventrepeat_nodeapi_'. $node->type, 0) == 1) && $node->eventrepeat_rid) { //create the option array - $options = array('this' => t('This occurance only'), - 'future' => t('This occurance and all future occurances'), - 'all' => t('All occurances') + $options = array('this' => t('This occurrence only'), + 'future' => t('This occurrence and all future occurrences'), + 'all' => t('All occurrences') ); //construct the radio buttons. NOTE: in order to prevent name collisions in the admin //delete process for multiple nodes, these form elements are named in array fashion, with nid to distinguish //the elements of the array $data_to_inject['eventrepeat_delete_type']['#tree'] = TRUE; - $data_to_inject['eventrepeat_delete_type'][$node->nid] = array('#type' => 'radios', '#title' => t('Repeat event--delete the following'), '#default_value' => 'this', '#options' => $options, '#description' => t('\'This occurance and all future occurances\' will delete repeat events from the date of the selected node forward, \'All occurances\' will delete repeat events after today\'s date.')); + $data_to_inject['eventrepeat_delete_type'][$node->nid] = array('#type' => 'radios', '#title' => t('Repeat event--delete the following'), '#default_value' => 'this', '#options' => $options, '#description' => t('\'This occurrence and all future occurrences\' will delete repeat events from the date of the selected node forward, \'All occurrences\' will delete repeat events after today\'s date.')); return $data_to_inject; } break;*/ @@ -827,7 +827,7 @@ function _eventrepeat_day_correction($st * @ingroup eventrepeat_support * @param $master_day The day of the week of the first day of the month. * @param $days_in_month The number of days in the month. - * @return An array in the same order as the days of the week (Sun-Sat), with values of 0 for days of the week with 4 occurances, and 1 for days of the week with 5 occurances. + * @return An array in the same order as the days of the week (Sun-Sat), with values of 0 for days of the week with 4 occurrences, and 1 for days of the week with 5 occurrences. */ function _eventrepeat_day_in_month_incrementer($master_day, $days_in_month) { @@ -922,16 +922,16 @@ function theme_eventrepeat_form($node) { if ($node->eventrepeat_rid) { $form['eventrepeat_rid'] = array('#type' => 'hidden', '#value' => $node->eventrepeat_rid); $options = array( - 'this' => t('This occurance only'), - 'future' => t('This occurance and all future occurances'), - 'all' => t('All occurances') + 'this' => t('This occurrence only'), + 'future' => t('This occurrence and all future occurrences'), + 'all' => t('All occurrences') ); $form['eventrepeat_edit_type'] = array( '#type' => 'radios', '#title' => t('Apply edit(s) to'), '#default_value' => 'future', '#options' => $options, - '#description' => t('\'This occurance and all future occurances\' will edit repeat events from the date of the selected node forward, \'All occurances\' will edit repeat events after today\'s date.
Note: editing a single occurance will remove it from the repeat sequence.'), + '#description' => t('\'This occurrence and all future occurrences\' will edit repeat events from the date of the selected node forward, \'All occurrences\' will edit repeat events after today\'s date.
Note: editing a single occurrence will remove it from the repeat sequence.'), '#weight' => -12 ); } @@ -997,7 +997,7 @@ function theme_eventrepeat_form($node) { // TODO: if editing based on count is unsupported, can we just use end date after the initial render? //COUNT param select box - $options = array (0 => '--'.t('Select'.'--')); + $options = array (0 => '--'. t('Select') .'--'); for ($i = 2; $i <= 100; $i++) { $options[$i] = $i; } @@ -1043,7 +1043,7 @@ function theme_eventrepeat_form_advanced ); //link to user help for repeat patterns - $form['eventrepeat_advanced']['help'] = array('#type' => 'markup', '#value' => '
'. t('Need help creating a repeat pattern? Click ') . l(t('here'), 'repeat/help') . t('
NOTE: Editing an existing repeat pattern maps previously created events to the new pattern, in sequential order, on all dates from the date where the edit is performed.') .'
'); + $form['eventrepeat_advanced']['help'] = array('#type' => 'markup', '#value' => '
'. t('Need help creating a repeat pattern? Click ') . l(t('here'), 'repeat/help') .'
'. t('NOTE: Editing an existing repeat pattern maps previously created events to the new pattern, in sequential order, on all dates from the date where the edit is performed.') .'
'); //INTERVAL param select box if($show_advanced['eventrepeat_INTERVAL']){ @@ -1283,7 +1283,7 @@ function _eventrepeat_form_date($element //months array $months = array( - '--'.t('Select').'--', + '--'.t('Select').'--', t('January'), t('February'), t('March'), @@ -1301,7 +1301,7 @@ function _eventrepeat_form_date($element //days array $days = array(0 => '--'.t('Select').'--'); for ($i = 1; $i <= 31; $i++) { - $days[$i] = $i; + $days[$i] = $i; } //compose the select boxes, and add the exception editor button if necessary @@ -1597,14 +1597,12 @@ function _eventrepeat_form_validate($for //warn if user entered values for both repeat end and COUNT if ($form_values['eventrepeat_end'] && $form_values['eventrepeat_COUNT']) { - form_set_error('eventrepeat_end', t('\'Repeat end date\' and \'Count\' cannot both be set--select only one to - provide a valid end point for the sequence')); + form_set_error('eventrepeat_end', t('\'Repeat end date\' and \'Count\' cannot both be set--select only one to provide a valid end point for the sequence')); } //warn if user tries to edit a sequence based on COUNT--this is currently not supported if ($node->eventrepeat_rid && $form_values['eventrepeat_COUNT']) { - form_set_error('eventrepeat_COUNT', t('Editing a sequence which uses the \'Count\' parameter is not supported. - Delete the sequence and recreate it with the new parameters.')); + form_set_error('eventrepeat_COUNT', t('Editing a sequence which uses the \'Count\' parameter is not supported. Delete the sequence and recreate it with the new parameters.')); } } @@ -2164,9 +2162,7 @@ function _eventrepeat_validate_form_date if (($node->$prefix > $event_start) || $type == 'Exception') { return TRUE; } else { - form_set_error('eventrepeat_endmonth', t('You have selected a date that is before or the same as the start of the selected event, - which is not allowed--check your repeat pattern settings and try again.
Note: If you are trying to shorten - the end date of a repeat cycle, perform that operation from an event date before the new end date.')); + form_set_error('eventrepeat_endmonth', t('You have selected a date that is before or the same as the start of the selected event, which is not allowed--check your repeat pattern settings and try again.
Note: If you are trying to shorten the end date of a repeat cycle, perform that operation from an event date before the new end date.')); return FALSE; }