- Spelling fixes: recure -> recur

This commit is contained in:
mgalgoci 2004-10-15 17:33:03 +00:00
parent 1451618cfd
commit d9553d5969
4 changed files with 15 additions and 13 deletions

View File

@ -3176,7 +3176,7 @@
$str .= ' ('.implode(', ',$str_extra).')'; $str .= ' ('.implode(', ',$str_extra).')';
} }
$var['recure_type'] = Array( $var['recur_type'] = Array(
'field' => lang('Repetition'), 'field' => lang('Repetition'),
'data' => $str, 'data' => $str,
); );

View File

@ -34,7 +34,7 @@
'owner' => 'Created By', 'owner' => 'Created By',
'updated' => 'Updated', 'updated' => 'Updated',
'alarm' => 'Alarm', 'alarm' => 'Alarm',
'recure_type' => 'Repetition' 'recur_type' => 'Repetition'
); );
function bocustom_fields() function bocustom_fields()

View File

@ -3128,6 +3128,9 @@
$recur_enddate['year'] = (int)($ical['event'][$i]['rrule']['until']['year']); $recur_enddate['year'] = (int)($ical['event'][$i]['rrule']['until']['year']);
$recur_enddate['month'] = (int)($ical['event'][$i]['rrule']['until']['month']); $recur_enddate['month'] = (int)($ical['event'][$i]['rrule']['until']['month']);
$recur_enddate['mday'] = (int)($ical['event'][$i]['rrule']['until']['mday']); $recur_enddate['mday'] = (int)($ical['event'][$i]['rrule']['until']['mday']);
$recur_enddate['hour'] = (int)($ical['event'][$i]['rrule']['until']['hour']);
$recur_enddate['min'] = (int)($ical['event'][$i]['rrule']['until']['min']);
$recur_enddate['sec'] = (int)($ical['event'][$i]['rrule']['until']['sec']);
} }
elseif( isset($ical['event'][$i]['duration']) ) elseif( isset($ical['event'][$i]['duration']) )
{ {
@ -3206,7 +3209,6 @@
$recur_enddate['min'], $recur_enddate['min'],
$recur_enddate['sec'] $recur_enddate['sec']
); );
} }
else else
{ {

View File

@ -4372,7 +4372,7 @@ return;
{ {
$str .= '<option value="'.$type.'"'.($event['recur_type']==$type?' selected':'').'>'.lang($label).'</option>'; $str .= '<option value="'.$type.'"'.($event['recur_type']==$type?' selected':'').'>'.lang($label).'</option>';
} }
$var['recure_type'] = Array( $var['recur_type'] = Array(
'field' => lang('Repeat Type'), 'field' => lang('Repeat Type'),
'data' => '<select name="cal[recur_type]">'."\n".$str.'</select>'."\n" 'data' => '<select name="cal[recur_type]">'."\n".$str.'</select>'."\n"
); );
@ -4388,7 +4388,7 @@ return;
$recur_end = $this->bo->maketime($event['start']) + 86400 - $GLOBALS['phpgw']->datetime->tz_offset; $recur_end = $this->bo->maketime($event['start']) + 86400 - $GLOBALS['phpgw']->datetime->tz_offset;
} }
$var['recure_enddate'] = Array( $var['recur_enddate'] = Array(
'field' => lang('Repeat End Date'), 'field' => lang('Repeat End Date'),
'data' => '<input type="checkbox" name="cal[rpt_use_end]" value="y"'.$checked.'>'.lang('Use End Date').' '. 'data' => '<input type="checkbox" name="cal[rpt_use_end]" value="y"'.$checked.'>'.lang('Use End Date').' '.
/* /*
@ -4407,12 +4407,12 @@ return;
$boxes .= '<input type="checkbox" name="cal[rpt_day][]" value="'.$mask.'"'.($event['recur_data'] & $mask ? ' checked' : '').'>&nbsp;'.lang($name)."\n"; $boxes .= '<input type="checkbox" name="cal[rpt_day][]" value="'.$mask.'"'.($event['recur_data'] & $mask ? ' checked' : '').'>&nbsp;'.lang($name)."\n";
if (++$i == 5) $boxes .= '<br>'; if (++$i == 5) $boxes .= '<br>';
} }
$var['recure_day'] = Array( $var['recur_day'] = Array(
'field' => lang('Repeat Day').'<br>'.lang('(for weekly)'), 'field' => lang('Repeat Day').'<br>'.lang('(for weekly)'),
'data' => $boxes 'data' => $boxes
); );
$var['recure_interval'] = Array( $var['recur_interval'] = Array(
'field' => lang('Interval'), 'field' => lang('Interval'),
'data' => '<input name="cal[recur_interval]" size="4" maxlength="4" value="'.$event['recur_interval'].'">' 'data' => '<input name="cal[recur_interval]" size="4" maxlength="4" value="'.$event['recur_interval'].'">'
); );
@ -4446,14 +4446,14 @@ return;
$this->output_template_array($p,'row','list',$var['enddate']); $this->output_template_array($p,'row','list',$var['enddate']);
$this->output_template_array($p,'row','list',$var['endtime']); $this->output_template_array($p,'row','list',$var['endtime']);
break; break;
case 'recure_type': case 'recur_type':
$p->set_var('tr_color',$this->theme['th_bg']); $p->set_var('tr_color',$this->theme['th_bg']);
$p->set_var('hr_text','<center><b>'.lang('Repeating Event Information').'</b></center>'); $p->set_var('hr_text','<center><b>'.lang('Repeating Event Information').'</b></center>');
$p->parse('row','hr',True); $p->parse('row','hr',True);
$this->output_template_array($p,'row','list',$var['recure_type']); $this->output_template_array($p,'row','list',$var['recur_type']);
$this->output_template_array($p,'row','list',$var['recure_enddate']); $this->output_template_array($p,'row','list',$var['recur_enddate']);
$this->output_template_array($p,'row','list',$var['recure_day']); $this->output_template_array($p,'row','list',$var['recur_day']);
$this->output_template_array($p,'row','list',$var['recure_interval']); $this->output_template_array($p,'row','list',$var['recur_interval']);
break; break;
default: default:
$this->output_template_array($p,'row','list',$var[$field]); $this->output_template_array($p,'row','list',$var[$field]);
@ -4491,7 +4491,7 @@ return;
case 'owner': case 'owner':
$preserved[$field] = $event['id'] ? $event['participants'][$event['owner']] : 'A'; $preserved[$field] = $event['id'] ? $event['participants'][$event['owner']] : 'A';
break; break;
case 'recure_type': case 'recur_type':
foreach(array('recur_type','recur_enddate','recur_data','recur_interval') as $field) foreach(array('recur_type','recur_enddate','recur_data','recur_interval') as $field)
{ {
$preserved[$field] = $event[$field]; $preserved[$field] = $event[$field];