Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

MDL-26243 calendar: display correct number of repeated events

  • Loading branch information...
commit 104ed36274b4af9b12225b0124f02c8a4aa350f6 1 parent 27c202c
Charles Fulton mackensen authored stronk7 committed

Showing 2 changed files with 6 additions and 4 deletions. Show diff stats Hide diff stats

  1. +5 3 calendar/event_form.php
  2. +1 1  lang/en/calendar.php
8 calendar/event_form.php
@@ -133,14 +133,16 @@ function definition () {
133 133 $mform->setDefault('repeats', 1);
134 134 $mform->disabledIf('repeats','repeat','notchecked');
135 135
136   - } else if ($repeatedevents > 0) {
  136 + } else if ($repeatedevents) {
137 137
138 138 $mform->addElement('hidden', 'repeatid');
139 139 $mform->setType('repeatid', PARAM_INT);
140 140
141 141 $mform->addElement('header', 'repeatedevents', get_string('repeatedevents', 'calendar'));
142   - $mform->addElement('checkbox', 'repeateditall', null, get_string('repeateditall', 'calendar', $repeatedevents), 'repeat');
143   - $mform->setDefault('repeateditall', 'checked');
  142 + $mform->addElement('radio', 'repeateditall', null, get_string('repeateditall', 'calendar', $this->_customdata->event->eventrepeats), 1);
  143 + $mform->addElement('radio', 'repeateditall', null, get_string('repeateditthis', 'calendar'), 0);
  144 +
  145 + $mform->setDefault('repeateditall', 1);
144 146
145 147 }
146 148
2  lang/en/calendar.php
@@ -114,7 +114,7 @@
114 114 $string['quickdownloadcalendar'] = 'Quick download / subscribe to calendar';
115 115 $string['recentupcoming'] = 'Recent and next 60 days';
116 116 $string['repeatedevents'] = 'Repeated events';
117   -$string['repeateditall'] = 'Apply changes to all {$a} events in this repeat series';
  117 +$string['repeateditall'] = 'Also apply changes to the other {$a} events in this repeat series';
118 118 $string['repeateditthis'] = 'Apply changes to this event only';
119 119 $string['repeatevent'] = 'Repeat this event';
120 120 $string['repeatnone'] = 'No repeats';

0 comments on commit 104ed36

Please sign in to comment.
Something went wrong with that request. Please try again.