MDL-10557, adding format_string() to support multilang filter usage on grade item...

diff --git a/grade/export/grade_export_form.php b/grade/export/grade_export_form.php
index 211019d76c6fdb582cbdaa8780501fcca9c09e24..ac7f5217eac8d55b4b6b156fdb9befa72d6aa044 100755 (executable)
--- a/grade/export/grade_export_form.php
+++ b/grade/export/grade_export_form.php
@@ -11,7 +11,7 @@ class grade_export_form extends moodleform {
         $mform->addElement('hidden', 'id', $id);
         if ($grade_items = grade_item::fetch_all(array('courseid'=>$id))) {
             foreach ($grade_items as $grade_item) {
-                $element = new HTML_QuickForm_advcheckbox('itemids[]', null, $grade_item->itemname, array('selected'=>'selected'), array(0, $grade_item->id));
+                $element = new HTML_QuickForm_advcheckbox('itemids[]', null, $grade_item->get_name(), array('selected'=>'selected'), array(0, $grade_item->id));
                 $element->setChecked(1);
                 $mform->addElement($element);
             }

diff --git a/grade/export/lib.php b/grade/export/lib.php
index 14ae50edb486166b0038d16bf985f75ec76d9187..324115af404ca4cc71a0a5c87e3635a27827276d 100755 (executable)
--- a/grade/export/lib.php
+++ b/grade/export/lib.php
@@ -136,7 +136,7 @@ class grade_export {
                 // load as an array of grade_final objects
                 if ($itemgrades = $gradeitem -> get_final()) {
 
-                    $this->columns[$gradeitem->id] = "$gradeitem->itemmodule: ".format_string($gradeitem->itemname,true)." - $gradeitem->grademax";
+                    $this->columns[$gradeitem->id] = "$gradeitem->itemmodule: ".$gradeitem->get_name()." - $gradeitem->grademax";
 
                     $this->columnidnumbers[$gradeitem->id] = $gradeitem->idnumber; // this might be needed for some export plugins
 

diff --git a/grade/export/txt/grade_export_txt_form.php b/grade/export/txt/grade_export_txt_form.php
index cdfa6254ab6b869856d9b20642f68ce7935a0412..fba28f0587f42ee089d39094487b51d7fdd4b64c 100755 (executable)
--- a/grade/export/txt/grade_export_txt_form.php
+++ b/grade/export/txt/grade_export_txt_form.php
@@ -11,7 +11,7 @@ class grade_export_txt_form extends moodleform {
         $mform->addElement('hidden', 'id', $id);
         if ($grade_items = grade_item::fetch_all(array('courseid'=>$id))) {
             foreach ($grade_items as $grade_item) {
-                $element = new HTML_QuickForm_advcheckbox('itemids[]', null, $grade_item->itemname, array('selected'=>'selected'), array(0, $grade_item->id));
+                $element = new HTML_QuickForm_advcheckbox('itemids[]', null, $grade_item->get_name(), array('selected'=>'selected'), array(0, $grade_item->id));
                 $element->setChecked(1);
                 $mform->addElement($element);
             }

diff --git a/grade/import/csv/index.php b/grade/import/csv/index.php
index 21b15c38975c64151e523b62fe9c54801b3dadd6..59ac85e157964f03a8a42bb36edceb1b47d675c0 100755 (executable)
--- a/grade/import/csv/index.php
+++ b/grade/import/csv/index.php
@@ -383,7 +383,7 @@ if (($formdata = data_submitted()) && !empty($formdata->map)) {
                 }
 
                 // this was idnumber
-                $gradeitems[$grade_item->id] = $grade_item->itemname;
+                $gradeitems[$grade_item->id] = $grade_item->get_name();
             }
         }
     }