Merge branch 'master_MDL-37660' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 Feb 2013 07:04:56 +0000 (15:04 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Feb 2013 07:04:56 +0000 (15:04 +0800)
mod/scorm/lang/en/scorm.php
mod/scorm/mod_form.php

index 3e0615e..c213011 100644 (file)
@@ -273,12 +273,12 @@ $string['reviewmode'] = 'Review mode';
 $string['scoes'] = 'Learning objects';
 $string['score'] = 'Score';
 $string['scorm:addinstance'] = 'Add a new SCORM package';
-$string['scormclose'] = 'Until';
+$string['scormclose'] = 'Available to';
 $string['scormcourse'] = 'Learning course';
 $string['scorm:deleteresponses'] = 'Delete SCORM attempts';
 $string['scormloggingoff'] = 'API logging is off';
 $string['scormloggingon'] = 'API logging is on';
-$string['scormopen'] = 'Open';
+$string['scormopen'] = 'Available from';
 $string['scormresponsedeleted'] = 'Deleted user attempts';
 $string['scorm:deleteownresponses'] = 'Delete own attempts';
 $string['scorm:savetrack'] = 'Save tracks';
@@ -314,7 +314,6 @@ $string['suspended'] = 'Suspended';
 $string['syntax'] = 'Syntax error';
 $string['tag_error'] = 'Unknown tag ({$a->tag}) with this content: {$a->value}';
 $string['time'] = 'Time';
-$string['timerestrict'] = 'Restrict answering to this time period';
 $string['title'] = 'Title';
 $string['toolbar'] = 'Show the toolbar';
 $string['too_many_attributes'] = 'Tag {$a->tag} has too many attributes';
index b9a7917..03add22 100644 (file)
@@ -85,13 +85,9 @@ class mod_scorm_mod_form extends moodleform_mod {
         $mform->addHelpButton('packagefile', 'package', 'scorm');
         $mform->disabledIf('packagefile', 'scormtype', 'noteq', SCORM_TYPE_LOCAL);
 
-        //-------------------------------------------------------------------------------
-        // Time restrictions
-        $mform->addElement('header', 'timerestricthdr', get_string('timerestrict', 'scorm'));
-
         $mform->addElement('date_time_selector', 'timeopen', get_string("scormopen", "scorm"), array('optional' => true));
         $mform->addElement('date_time_selector', 'timeclose', get_string("scormclose", "scorm"), array('optional' => true));
-        //-------------------------------------------------------------------------------
+
         // display Settings
         $mform->addElement('header', 'displaysettings', get_string('displaysettings', 'scorm'));
         // Framed / Popup Window