Merge branch 'wip-MDL-39298-master' of git://github.com/abgreeve/moodle

diff --git a/grade/export/grade_export_form.php b/grade/export/grade_export_form.php
index 282a8d8..9081f00 100644 (file)
--- a/grade/export/grade_export_form.php
+++ b/grade/export/grade_export_form.php
@@ -86,6 +86,8 @@ class grade_export_form extends moodleform {
             $radio = array();
             $radio[] = $mform->createElement('radio', 'separator', null, get_string('septab', 'grades'), 'tab');
             $radio[] = $mform->createElement('radio', 'separator', null, get_string('sepcomma', 'grades'), 'comma');
+            $radio[] = $mform->createElement('radio', 'separator', null, get_string('sepcolon', 'grades'), 'colon');
+            $radio[] = $mform->createElement('radio', 'separator', null, get_string('sepsemicolon', 'grades'), 'semicolon');
             $mform->addGroup($radio, 'separator', get_string('separator', 'grades'), ' ', false);
             $mform->setDefault('separator', 'comma');
         }

diff --git a/grade/import/grade_import_form.php b/grade/import/grade_import_form.php
index 9723be2..9f86e48 100644 (file)
--- a/grade/import/grade_import_form.php
+++ b/grade/import/grade_import_form.php
@@ -48,6 +48,8 @@ class grade_import_form extends moodleform {
             $radio = array();
             $radio[] = $mform->createElement('radio', 'separator', null, get_string('septab', 'grades'), 'tab');
             $radio[] = $mform->createElement('radio', 'separator', null, get_string('sepcomma', 'grades'), 'comma');
+            $radio[] = $mform->createElement('radio', 'separator', null, get_string('sepcolon', 'grades'), 'colon');
+            $radio[] = $mform->createElement('radio', 'separator', null, get_string('sepsemicolon', 'grades'), 'semicolon');
             $mform->addGroup($radio, 'separator', get_string('separator', 'grades'), ' ', false);
             $mform->setDefault('separator', 'comma');
         }

diff --git a/lang/en/grades.php b/lang/en/grades.php
index 6af26b5..04578b8 100644 (file)
--- a/lang/en/grades.php
+++ b/lang/en/grades.php
@@ -539,7 +539,9 @@ $string['selectalloroneuser'] = 'Select all or one user';
 $string['selectauser'] = 'Select a user';
 $string['selectdestination'] = 'Select destination of {$a}';
 $string['separator'] = 'Separator';
+$string['sepcolon'] = 'Colon';
 $string['sepcomma'] = 'Comma';
+$string['sepsemicolon'] = 'Semicolon';
 $string['septab'] = 'Tab';
 $string['setcategories'] = 'Set categories';
 $string['setcategorieserror'] = 'You must first set the categories for your course before you can give weights to them.';