moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-22259b' of git://github.com/srynot4sale/moodle

Browse source
This commit is contained in:
Dan Poltawski 2012-07-16 11:57:04 +08:00
commit bea8b7454e
4 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
blocks/completionstatus/block_completionstatus.php
View file

@ -166,7 +166,7 @@ class block_completionstatus extends block_base {
if (!empty($prerequisites)) {
$phtml = '<tr><td>';
$phtml .= get_string('prerequisitescompleted', 'completion');
$phtml .= get_string('dependenciescompleted', 'completion');
$phtml .= '</td><td style="text-align: right">';
$a = new stdClass();
$a->first = $prerequisites_complete;

2
course/completion_form.php
View file

@ -65,7 +65,7 @@ class course_completion_form extends moodleform {
$mform->setDefault('overall_aggregation', $completion->get_aggregation_method());
// Course prerequisite completion criteria
$mform->addElement('header', 'courseprerequisites', get_string('courseprerequisites', 'completion'));
$mform->addElement('header', 'courseprerequisites', get_string('completiondependencies', 'completion'));
// Get applicable courses
$courses = $DB->get_records_sql(

7
lang/en/completion.php
View file

@ -88,12 +88,12 @@ $string['yourprogress'] = 'Your progress';
$string['achievinggrade']='Achieving grade';
$string['activities']='Activities';
$string['activitiescompleted']='Activities completed';
$string['addcourseprerequisite']='Add course prerequisite';
$string['afterspecifieddate']='After specified date';
$string['aggregationmethod']='Aggregation method';
$string['all']='All';
$string['any']='Any';
$string['approval']='Approval';
$string['completiondependencies']='Completion dependencies';
$string['completionenabled']='Enabled, control via completion and activity settings';
$string['completionmenuitem']='Completion';
$string['completiononunenrolment']='Completion on unenrolment';
@ -106,7 +106,6 @@ $string['coursealreadycompleted']='You have already completed this course';
$string['coursecomplete']='Course complete';
$string['coursecompleted']='Course completed';
$string['coursegrade']='Course grade';
$string['courseprerequisites']='Course prerequisites';
$string['coursesavailable']='Courses available';
$string['coursesavailableexplaination']='<i>Course completion criteria must be set for a course to appear in this list</i>';
$string['criteria']='Criteria';
@ -115,6 +114,8 @@ $string['criteriagroup']='Criteria group';
$string['criteriarequiredall']='All criteria below are required';
$string['criteriarequiredany']='Any criteria below are required';
$string['days']='Days';
$string['dependencies']='Dependencies';
$string['dependenciescompleted']='Dependencies completed';
$string['editcoursecompletionsettings']='Edit course completion settings';
$string['enrolmentduration']='Days left';
$string['err_nocourses']='Course completion is not enabled for any other courses, so none can be displayed. You can enable course completion in the course settings.';
@ -141,8 +142,6 @@ $string['notyetstarted']='Not yet started';
$string['overallcriteriaaggregation']='Overall criteria type aggregation';
$string['pending']='Pending';
$string['periodpostenrolment']='Period post enrolment';
$string['prerequisites']='Prerequisites';
$string['prerequisitescompleted']='Prerequisites completed';
$string['recognitionofpriorlearning']='Recognition of prior learning';
$string['remainingenroledfortime']='Remaining enrolled for a specified period of time';
$string['remainingenroleduntildate']='Remaining enrolled until a specified date';

4
lib/completion/completion_criteria_course.php
View file

@ -123,7 +123,7 @@ class completion_criteria_course extends completion_criteria {
* @return string
*/
public function get_title() {
return get_string('prerequisitescompleted', 'completion');
return get_string('dependenciescompleted', 'completion');
}
/**
@ -146,7 +146,7 @@ class completion_criteria_course extends completion_criteria {
* @return string
*/
public function get_type_title() {
return get_string('prerequisites', 'completion');
return get_string('dependencies', 'completion');
}
/**