From 77b3e35105ac24139353c25ebda50595b7a7e35f Mon Sep 17 00:00:00 2001 From: Raymond Wijaya Date: Mon, 20 Aug 2012 14:04:29 +0800 Subject: [PATCH] MDL-34907: Add a missing string that triggers Javascript error in assignment upgrade tool --- admin/tool/assignmentupgrade/lang/en/tool_assignmentupgrade.php | 1 + admin/tool/assignmentupgrade/module.js | 2 +- admin/tool/assignmentupgrade/renderer.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/admin/tool/assignmentupgrade/lang/en/tool_assignmentupgrade.php b/admin/tool/assignmentupgrade/lang/en/tool_assignmentupgrade.php index e9a61dcb381..9dc8c6ece9f 100644 --- a/admin/tool/assignmentupgrade/lang/en/tool_assignmentupgrade.php +++ b/admin/tool/assignmentupgrade/lang/en/tool_assignmentupgrade.php @@ -36,6 +36,7 @@ $string['conversioncomplete'] = 'Assignment converted'; $string['conversionfailed'] = 'The assignment conversion was not successful. The log from the upgrade was:
{$a}'; $string['listnotupgraded'] = 'List assignments that have not been upgraded'; $string['listnotupgraded_desc'] = 'You can upgrade individual assignments from here'; +$string['noassignmentsselected'] = 'No assignments selected'; $string['noassignmentstoupgrade'] = 'There are no assignments that require upgrading'; $string['notsupported'] = ''; $string['notupgradedintro'] = 'This page lists the assignments created with an older version of Moodle that have not been upgraded to the new assignment module in Moodle 2.3. Not all assignments can be upgraded - if they were created with a custom assignment subtype, then that subtype will need to be upgraded to the new assignment plugin format in order to complete the upgrade.'; diff --git a/admin/tool/assignmentupgrade/module.js b/admin/tool/assignmentupgrade/module.js index edee839835f..6370e706807 100644 --- a/admin/tool/assignmentupgrade/module.js +++ b/admin/tool/assignmentupgrade/module.js @@ -56,7 +56,7 @@ M.tool_assignmentupgrade = { assignmentsinput = Y.one('input.selectedassignments'); assignmentsinput.set('value', selectedassignments.join(',')); if (selectedassignments.length == 0) { - alert(M.str.assign.noassignmentsselected); + alert(M.str.tool_assignmentupgrade.noassignmentsselected); e.preventDefault(); } }); diff --git a/admin/tool/assignmentupgrade/renderer.php b/admin/tool/assignmentupgrade/renderer.php index ddb8cfabad4..29192d76e6c 100644 --- a/admin/tool/assignmentupgrade/renderer.php +++ b/admin/tool/assignmentupgrade/renderer.php @@ -119,7 +119,7 @@ class tool_assignmentupgrade_renderer extends plugin_renderer_base { $output = ''; $output .= $this->header(); $this->page->requires->js_init_call('M.tool_assignmentupgrade.init_upgrade_table', array()); - + $this->page->requires->string_for_js('noassignmentsselected', 'tool_assignmentupgrade'); $output .= $this->heading(get_string('notupgradedtitle', 'tool_assignmentupgrade')); $output .= $this->box(get_string('notupgradedintro', 'tool_assignmentupgrade'));