MDL-13530 - Improve words used in the gradebook plugin selector dropdown menu

diff --git a/grade/lib.php b/grade/lib.php
index 2dd51eeb3214a28698483dc6d156b6a1f58751bc..52cbcf3e9a4ee36a345414f9c400c00dda386655 100644 (file)
--- a/grade/lib.php
+++ b/grade/lib.php
@@ -331,7 +331,7 @@ function print_grade_plugin_selector($courseid, $active_type, $active_plugin, $r
         asort($reportnames);
     }
     if (!empty($reportnames)) {
-        $menu['reportgroup']='--'.get_string('reportplugins', 'grades');
+        $menu['reportgroup']='--'.get_string('view');
         $menu = $menu+$reportnames;
     }
 
@@ -356,7 +356,7 @@ function print_grade_plugin_selector($courseid, $active_type, $active_plugin, $r
         asort($importnames);
     }
     if (!empty($importnames)) {
-        $menu['importgroup']='--'.get_string('importplugins', 'grades');
+        $menu['importgroup']='--'.get_string('importfrom', 'grades');
         $menu = $menu+$importnames;
     }
 
@@ -381,7 +381,7 @@ function print_grade_plugin_selector($courseid, $active_type, $active_plugin, $r
         asort($exportnames);
     }
     if (!empty($exportnames)) {
-        $menu['exportgroup']='--'.get_string('exportplugins', 'grades');
+        $menu['exportgroup']='--'.get_string('exportto', 'grades');
         $menu = $menu+$exportnames;
     }
 
@@ -446,7 +446,8 @@ function print_grade_plugin_selector($courseid, $active_type, $active_plugin, $r
 
 /// finally print/return the popup form
     if ($count > 1) {
-        return popup_form($CFG->wwwroot.'/grade/', $menu, 'choosepluginreport', $active, 'choose', '', '', $return, 'self', get_string('view'));
+        return popup_form($CFG->wwwroot.'/grade/', $menu, 'choosepluginreport', '',
+                get_string('chooseaction', 'grades'), '', '', $return, 'self');
     } else {
         // only one option - no plugin selector needed
         return '';

diff --git a/lang/en_utf8/grades.php b/lang/en_utf8/grades.php
index 47c0f8c1a61a4dbc28512e2fcd9de65487160c53..81f85e042a31d43d38a65af08aa460561604749a 100644 (file)
--- a/lang/en_utf8/grades.php
+++ b/lang/en_utf8/grades.php
@@ -65,6 +65,7 @@ $string['categoryname'] = 'Category name';
 $string['categorytotal'] = 'Category total';
 $string['changereportdefaults'] = 'Change report defaults';
 $string['choosecategory'] = 'Select category';
+$string['chooseaction'] = 'Choose an action ...';
 $string['compact'] = 'Compact';
 $string['configdisablegradehistory'] = 'Disable history tracking of changes in grades related tables. This may speed up the server a little and conserve space in database.';
 $string['configaggregationposition'] = 'Defines the position of the aggregation total column in the report related to the grades being aggregated.';
@@ -161,6 +162,7 @@ $string['export'] = 'Export';
 $string['exportfeedback'] = 'Include feedback in export';
 $string['exportplugins'] = 'Export plugins';
 $string['exportselectedoutcomes'] = 'Export selected outcomes';
+$string['exportto'] = 'Export to';
 $string['extracredit'] = 'Extra Credit';
 $string['extracreditwarning'] = 'Note: Setting all items for a category to extra credit will effectively remove them from the grade calculation. Since there will be no point total';
 $string['feedback'] = 'Feedback';
@@ -258,6 +260,7 @@ $string['import'] = 'Import';
 $string['importcsv'] = 'Import CSV';
 $string['importcustom'] = 'Import as custom outcomes (only this course)';
 $string['importerror'] = 'An error occured, this script wasn\'t called with the right parameters.';
+$string['importfrom'] = 'Import from';
 $string['importfailed'] = 'Import failed';
 $string['importfeedback'] = 'Import feedback';
 $string['importfile'] = 'Import file';