MDL-56766 calendar: improve calendar export labels

hig3 · Nov 9, 2016 · 757aef2 · 757aef2
1 parent 258d07d
commit 757aef2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/calendar/classes/export_form.php b/calendar/classes/export_form.php
@@ -51,7 +51,7 @@ public function definition() {
         $export[] = $mform->createElement('radio', 'exportevents', '', get_string('eventsrelatedtogroups', 'calendar'), 'groups');
         $export[] = $mform->createElement('radio', 'exportevents', '', get_string('eventspersonal', 'calendar'), 'user');
 
-        $mform->addGroup($export, 'events', get_string('export', 'calendar'), '<br/>');
+        $mform->addGroup($export, 'events', get_string('eventstoexport', 'calendar'), '<br/>');
         $mform->addGroupRule('events', get_string('required'), 'required');
         $mform->setDefault('events', 'all');
 
@@ -79,7 +79,7 @@ public function definition() {
             $range[] = $mform->createElement('radio', 'timeperiod', '', get_string('customexport', 'calendar', $a), 'custom');
         }
 
-        $mform->addGroup($range, 'period', get_string('for', 'calendar'), '<br/>');
+        $mform->addGroup($range, 'period', get_string('timeperiod', 'calendar'), '<br/>');
         $mform->addGroupRule('period', get_string('required'), 'required');
         $mform->setDefault('period', 'recentupcoming');
 
@@ -88,4 +88,4 @@ public function definition() {
         $buttons[] = $mform->createElement('submit', 'export', get_string('exportbutton', 'calendar'));
         $mform->addGroup($buttons);
     }
-}
+}
diff --git a/lang/en/calendar.php b/lang/en/calendar.php
@@ -90,6 +90,7 @@
 $string['eventsrelatedtocourses'] = 'Events related to courses';
 $string['eventsrelatedtogroups'] = 'Events related to groups';
 $string['eventstarttime'] = 'Start time';
+$string['eventstoexport'] = 'Events to export';
 $string['eventtime'] = 'Time';
 $string['eventview'] = 'Event details';
 $string['eventcalendareventcreated'] = 'Calendar event created';
@@ -103,7 +104,6 @@
 $string['export'] = 'Export';
 $string['exportbutton'] = 'Export';
 $string['exportcalendar'] = 'Export calendar';
-$string['for'] = 'for';
 $string['forcecalendartype'] = 'Force calendar';
 $string['fri'] = 'Fri';
 $string['friday'] = 'Friday';
@@ -189,6 +189,7 @@
 $string['thursday'] = 'Thursday';
 $string['timeformat_12'] = '12-hour (am/pm)';
 $string['timeformat_24'] = '24-hour';
+$string['timeperiod'] = 'Time period';
 $string['today'] = 'Today';
 $string['tomorrow'] = 'Tomorrow';
 $string['tt_deleteevent'] = 'Delete event';
@@ -220,3 +221,6 @@
 $string['weekthis'] = 'This week';
 $string['yesterday'] = 'Yesterday';
 $string['youcandeleteallrepeats'] = 'This event is part of a repeating event series. You can delete this event only, or all {$a} events in the series at once.';
+
+// Deprecated since Moodle 3.2.
+$string['for'] = 'for';
diff --git a/lang/en/deprecated.txt b/lang/en/deprecated.txt
@@ -38,3 +38,4 @@ revealpassword,core_form
 mediasettings,core_media
 legacyheading,core_media
 legacyheading_desc,core_media
+for,core_calendar