diff --git a/group/import_form.php b/group/import_form.php index e877b5f7bbf08..ce13446d3ecb5 100644 --- a/group/import_form.php +++ b/group/import_form.php @@ -27,6 +27,7 @@ } require_once($CFG->libdir.'/formslib.php'); +require_once($CFG->libdir . '/csvlib.class.php'); /** * Groups import form class @@ -56,6 +57,19 @@ function definition() { $mform->addElement('hidden', 'id'); $mform->setType('id', PARAM_INT); + $choices = csv_import_reader::get_delimiter_list(); + $mform->addElement('select', 'delimiter_name', get_string('csvdelimiter', 'group'), $choices); + if (array_key_exists('cfg', $choices)) { + $mform->setDefault('delimiter_name', 'cfg'); + } else if (get_string('listsep', 'langconfig') == ';') { + $mform->setDefault('delimiter_name', 'semicolon'); + } else { + $mform->setDefault('delimiter_name', 'comma'); + } + + $choices = core_text::get_encodings(); + $mform->addElement('select', 'encoding', get_string('encoding', 'group'), $choices); + $mform->setDefault('encoding', 'UTF-8'); $this->add_action_buttons(true, get_string('importgroups', 'core_group')); $this->set_data($data); diff --git a/lang/en/group.php b/lang/en/group.php index 9f32f85f89049..ab1ce3eb3dd4c 100644 --- a/lang/en/group.php +++ b/lang/en/group.php @@ -43,6 +43,7 @@ $string['creategroupinselectedgrouping'] = 'Create group in grouping'; $string['createingrouping'] = 'Grouping of auto-created groups'; $string['createorphangroup'] = 'Create orphan group'; +$string['csvdelimiter'] = 'CSV delimiter'; $string['databaseupgradegroups'] = 'Groups version is now {$a}'; $string['defaultgrouping'] = 'Default grouping'; $string['defaultgroupingname'] = 'Grouping'; @@ -59,6 +60,7 @@ $string['editusersgroupsa'] = 'Edit groups for "{$a}"'; $string['enablemessaging'] = 'Group messaging'; $string['enablemessaging_help'] = 'If enabled, group members can send messages to the others in their group via the messaging drawer.'; +$string['encoding'] = 'Encoding'; $string['enrolmentkey'] = 'Enrolment key'; $string['enrolmentkey_help'] = 'An enrolment key enables access to the course to be restricted to only those who know the key. If a group enrolment key is specified, then not only will entering that key let the user into the course, but it will also automatically make them a member of this group.