diff --git a/group/import.php b/group/import.php index c485388ad98..12cac87316c 100644 --- a/group/import.php +++ b/group/import.php @@ -39,7 +39,7 @@ $context = get_context_instance(CONTEXT_COURSE, $id); require_capability('moodle/course:managegroups', $context); -$strimportgroups = get_string("importgroups"); +$strimportgroups = get_string('importgroups', 'core_group'); /// Print the header $PAGE->navbar->add($course->shortname, new moodle_url('/course/view.php', array('id'=>$course->id))); @@ -188,6 +188,6 @@ if ($mform_post->is_cancelled()) { /// Print the form echo $OUTPUT->header(); -echo $OUTPUT->heading($strimportgroups); +echo $OUTPUT->heading_with_help($strimportgroups, 'importgroups', 'core_group'); $mform_post ->display(); echo $OUTPUT->footer(); diff --git a/group/import_form.php b/group/import_form.php index f59a0e48bbc..99e32060073 100644 --- a/group/import_form.php +++ b/group/import_form.php @@ -23,7 +23,7 @@ class groups_import_form extends moodleform { $mform->addElement('hidden', 'id'); - $this->add_action_buttons(true, get_string('importgroups')); + $this->add_action_buttons(true, get_string('importgroups', 'core_group')); $this->set_data($data); } diff --git a/group/index.php b/group/index.php index 5df39bf8da5..0eeaf4d2926 100644 --- a/group/index.php +++ b/group/index.php @@ -215,7 +215,7 @@ echo '

'."\n"; echo '

'."\n"; + . get_string('importgroups', 'core_group') . '" />

'."\n"; echo ''."\n"; echo ''."\n"; diff --git a/lang/en/group.php b/lang/en/group.php index e72ec0fc461..7a98c5b473b 100644 --- a/lang/en/group.php +++ b/lang/en/group.php @@ -114,6 +114,15 @@ $string['groupsseparate'] = 'Separate groups'; $string['groupsvisible'] = 'Visible groups'; $string['grouptemplate'] = 'Group @'; $string['hidepicture'] = 'Hide picture'; +$string['importgroups'] = 'Import groups'; +$string['importgroups_help'] = 'Groups may be imported via text file. The format of the file should be as follows: + +* Each line of the file contains one record +* Each record is a series of data separated by commas +* The first record contains a list of fieldnames defining the format of the rest of the file +* Required fieldname is groupname +* Optional fieldnames are description, enrolmentkey, picture, hidepicture'; +$string['importgroups_link'] = 'group/import'; $string['javascriptrequired'] = 'This page requires JavaScript to be enabled.'; $string['members'] = 'Members per group'; $string['membersofselectedgroup'] = 'Members of:'; diff --git a/lang/en/moodle.php b/lang/en/moodle.php index 593bf2122c0..05b7957c6a6 100644 --- a/lang/en/moodle.php +++ b/lang/en/moodle.php @@ -859,7 +859,6 @@ $string['importdata'] = 'Import course data'; $string['importdataexported'] = 'Exported data from \'from\' course successfully.
Continue to import into your \'to\' course.'; $string['importdatafinished'] = 'Import complete! Continue to your course'; $string['importdatafrom'] = 'Find a course to import data from:'; -$string['importgroups'] = 'Import groups'; $string['inactive'] = 'Inactive'; $string['include'] = 'Include'; $string['includeallusers'] = 'Include all users';