From 74e78f3ad8c7091e67aff07076b7a497456c82b8 Mon Sep 17 00:00:00 2001 From: Dan Marsden Date: Thu, 30 Jun 2011 19:38:15 +1200 Subject: [PATCH 1/2] SCORM MDL-28110 set default for forcejavascript to yes - add string explaining what it does. --- mod/scorm/lang/en/scorm.php | 1 + mod/scorm/settings.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mod/scorm/lang/en/scorm.php b/mod/scorm/lang/en/scorm.php index 46d027ac6dc..ee603482f2a 100644 --- a/mod/scorm/lang/en/scorm.php +++ b/mod/scorm/lang/en/scorm.php @@ -98,6 +98,7 @@ $string['forcenewattempt'] = 'Force new attempt'; $string['forcenewattempt_help'] = 'If enabled, each time a SCORM package is accessed will be counted as a new attempt.'; $string['forcenewattemptdesc'] = 'This preference sets the default value for the force new attempt setting'; $string['forcejavascript'] = 'Force users to enable JavaScript'; +$string['forcejavascript_help'] = 'If enabled(recommended) this prevents access to SCORM objects when JavaScript is not supported/enabled in a users browser. If disabled the user may view the SCORM but API communication will fail and no grade information will be saved.'; $string['forcejavascriptmessage'] = 'JavaScript is required to view this object, please enable JavaScript in your browser and try again.'; $string['found'] = 'Manifest found'; $string['frameheight'] = 'This preference set the default height for stage frame or window'; diff --git a/mod/scorm/settings.php b/mod/scorm/settings.php index 8a0afebc9f1..c60bd376a46 100644 --- a/mod/scorm/settings.php +++ b/mod/scorm/settings.php @@ -58,7 +58,7 @@ if ($ADMIN->fulltree) { $settings->add(new admin_setting_configcheckbox('scorm/allowtypeimsrepository', get_string('allowtypeimsrepository', 'scorm'), '', 0)); - $settings->add(new admin_setting_configcheckbox('scorm/forcejavascript', get_string('forcejavascript', 'scorm'), '', 0)); + $settings->add(new admin_setting_configcheckbox('scorm/forcejavascript', get_string('forcejavascript', 'scorm'), get_string('forcejavascript_help', 'scorm'), 1)); $settings->add(new admin_setting_configcheckbox('scorm/allowapidebug', get_string('allowapidebug', 'scorm'), '', 0)); From 473afcbfecd103810f3024386b15ed7646dc9964 Mon Sep 17 00:00:00 2001 From: Dan Marsden Date: Fri, 1 Jul 2011 14:23:45 +1200 Subject: [PATCH 2/2] SCORM MDL-28110 fix string name --- mod/scorm/lang/en/scorm.php | 2 +- mod/scorm/settings.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/scorm/lang/en/scorm.php b/mod/scorm/lang/en/scorm.php index ee603482f2a..ba1f66ed23c 100644 --- a/mod/scorm/lang/en/scorm.php +++ b/mod/scorm/lang/en/scorm.php @@ -98,7 +98,7 @@ $string['forcenewattempt'] = 'Force new attempt'; $string['forcenewattempt_help'] = 'If enabled, each time a SCORM package is accessed will be counted as a new attempt.'; $string['forcenewattemptdesc'] = 'This preference sets the default value for the force new attempt setting'; $string['forcejavascript'] = 'Force users to enable JavaScript'; -$string['forcejavascript_help'] = 'If enabled(recommended) this prevents access to SCORM objects when JavaScript is not supported/enabled in a users browser. If disabled the user may view the SCORM but API communication will fail and no grade information will be saved.'; +$string['forcejavascript_desc'] = 'If enabled(recommended) this prevents access to SCORM objects when JavaScript is not supported/enabled in a users browser. If disabled the user may view the SCORM but API communication will fail and no grade information will be saved.'; $string['forcejavascriptmessage'] = 'JavaScript is required to view this object, please enable JavaScript in your browser and try again.'; $string['found'] = 'Manifest found'; $string['frameheight'] = 'This preference set the default height for stage frame or window'; diff --git a/mod/scorm/settings.php b/mod/scorm/settings.php index c60bd376a46..861b0fb4676 100644 --- a/mod/scorm/settings.php +++ b/mod/scorm/settings.php @@ -58,7 +58,7 @@ if ($ADMIN->fulltree) { $settings->add(new admin_setting_configcheckbox('scorm/allowtypeimsrepository', get_string('allowtypeimsrepository', 'scorm'), '', 0)); - $settings->add(new admin_setting_configcheckbox('scorm/forcejavascript', get_string('forcejavascript', 'scorm'), get_string('forcejavascript_help', 'scorm'), 1)); + $settings->add(new admin_setting_configcheckbox('scorm/forcejavascript', get_string('forcejavascript', 'scorm'), get_string('forcejavascript_desc', 'scorm'), 1)); $settings->add(new admin_setting_configcheckbox('scorm/allowapidebug', get_string('allowapidebug', 'scorm'), '', 0));