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-32535-master' of git://github.com/sammarshallou/moodle

Browse source
This commit is contained in:
Dan Poltawski 2012-05-18 10:28:19 +08:00
commit 79f3d0e027
3 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lang/en/completion.php
View file

@ -34,14 +34,18 @@ $string['completion_help'] = 'If enabled, activity completion is tracked, either
A tick next to the activity name on the course page indicates when the activity is complete.'; A tick next to the activity name on the course page indicates when the activity is complete.';
$string['completion_link'] = 'activity/completion'; $string['completion_link'] = 'activity/completion';
$string['completion-alt-auto-enabled'] = 'The system marks this item complete according to conditions'; $string['completion-alt-auto-enabled'] = 'The system marks this item complete according to conditions: {$a}';
$string['completion-alt-auto-fail'] = 'Completed (did not achieve pass grade)'; $string['completion-alt-auto-fail'] = 'Completed: {$a} (did not achieve pass grade)';
$string['completion-alt-auto-n'] = 'Not completed: {$a}'; $string['completion-alt-auto-n'] = 'Not completed: {$a}';
$string['completion-alt-auto-pass'] = 'Completed (achieved pass grade)'; $string['completion-alt-auto-pass'] = 'Completed: {$a} (achieved pass grade)';
$string['completion-alt-auto-y'] = 'Completed: {$a}'; $string['completion-alt-auto-y'] = 'Completed: {$a}';
$string['completion-alt-manual-enabled'] = 'Students can manually mark this item complete'; $string['completion-alt-manual-enabled'] = 'Students can manually mark this item complete: {$a}';
$string['completion-alt-manual-n'] = 'Not completed: {$a}. Select to mark as complete.'; $string['completion-alt-manual-n'] = 'Not completed: {$a}. Select to mark as complete.';
$string['completion-alt-manual-y'] = 'Completed: {$a}. Select to mark as not complete.'; $string['completion-alt-manual-y'] = 'Completed: {$a}. Select to mark as not complete.';
$string['completion-y'] = 'Completed';
$string['completion-n'] = 'Not completed';
$string['completion-fail'] = 'Completed (did not achieve pass grade)';
$string['completion-pass'] = 'Completed (achieved pass grade)';
$string['completion_automatic'] = 'Show activity as complete when conditions are met'; $string['completion_automatic'] = 'Show activity as complete when conditions are met';
$string['completiondisabled'] = 'Disabled, not shown in activity settings'; $string['completiondisabled'] = 'Disabled, not shown in activity settings';
$string['completionexpected'] = 'Expect completed on'; $string['completionexpected'] = 'Expect completed on';
@ -95,6 +99,7 @@ $string['completiononunenrolment']='Completion on unenrolment';
$string['completionsettingslocked']='Completion settings locked'; $string['completionsettingslocked']='Completion settings locked';
$string['completionstartonenrol']='Completion tracking begins on enrolment'; $string['completionstartonenrol']='Completion tracking begins on enrolment';
$string['completionstartonenrolhelp']='Begin tracking a student\'s progress in course completion after course enrolment'; $string['completionstartonenrolhelp']='Begin tracking a student\'s progress in course completion after course enrolment';
$string['completed'] = 'Completed';
$string['confirmselfcompletion']='Confirm self completion'; $string['confirmselfcompletion']='Confirm self completion';
$string['coursealreadycompleted']='You have already completed this course'; $string['coursealreadycompleted']='You have already completed this course';
$string['coursecomplete']='Course complete'; $string['coursecomplete']='Course complete';
@ -125,6 +130,7 @@ $string['markcomplete']='Mark complete';
$string['markedcompleteby']='Marked complete by {$a}'; $string['markedcompleteby']='Marked complete by {$a}';
$string['markingyourselfcomplete']='Marking yourself complete'; $string['markingyourselfcomplete']='Marking yourself complete';
$string['moredetails']='More details'; $string['moredetails']='More details';
$string['notcompleted'] = 'Not completed';
$string['nocriteriaset']='No completion criteria set for this course'; $string['nocriteriaset']='No completion criteria set for this course';
$string['notenroled']='You are not enrolled in this course'; $string['notenroled']='You are not enrolled in this course';
$string['notyetstarted']='Not yet started'; $string['notyetstarted']='Not yet started';

8
report/completion/index.php
View file

@ -602,7 +602,7 @@ foreach ($progress as $user) {
($activity->completion==COMPLETION_TRACKING_AUTOMATIC ? 'auto' : 'manual'). ($activity->completion==COMPLETION_TRACKING_AUTOMATIC ? 'auto' : 'manual').
'-'.$completiontype; '-'.$completiontype;
$describe=get_string('completion-alt-auto-'.$completiontype,'completion'); $describe = get_string('completion-' . $completiontype, 'completion');
$a=new StdClass; $a=new StdClass;
$a->state=$describe; $a->state=$describe;
$a->date=$date; $a->date=$date;
@ -631,7 +631,7 @@ foreach ($progress as $user) {
$completiontype = $is_complete ? 'y' : 'n'; $completiontype = $is_complete ? 'y' : 'n';
$completionicon = 'completion-auto-'.$completiontype; $completionicon = 'completion-auto-'.$completiontype;
$describe = get_string('completion-alt-auto-'.$completiontype, 'completion'); $describe = get_string('completion-' . $completiontype, 'completion');
$a = new stdClass(); $a = new stdClass();
$a->state = $describe; $a->state = $describe;
@ -645,7 +645,7 @@ foreach ($progress as $user) {
} else { } else {
if ($allow_marking_criteria === $criterion->id) { if ($allow_marking_criteria === $criterion->id) {
$describe = get_string('completion-alt-auto-'.$completiontype,'completion'); $describe = get_string('completion-' . $completiontype, 'completion');
print '<td class="completion-progresscell">'. print '<td class="completion-progresscell">'.
'<a href="'.$CFG->wwwroot.'/course/togglecompletion.php?user='.$user->id.'&amp;course='.$course->id.'&amp;rolec='.$allow_marking_criteria.'&amp;sesskey='.sesskey().'">'. '<a href="'.$CFG->wwwroot.'/course/togglecompletion.php?user='.$user->id.'&amp;course='.$course->id.'&amp;rolec='.$allow_marking_criteria.'&amp;sesskey='.sesskey().'">'.
@ -670,7 +670,7 @@ foreach ($progress as $user) {
$ccompletion = new completion_completion($params); $ccompletion = new completion_completion($params);
$completiontype = $ccompletion->is_complete() ? 'y' : 'n'; $completiontype = $ccompletion->is_complete() ? 'y' : 'n';
$describe = get_string('completion-alt-auto-'.$completiontype, 'completion'); $describe = get_string('completion-' . $completiontype, 'completion');
$a = new StdClass; $a = new StdClass;
$a->state = $describe; $a->state = $describe;

2
report/progress/index.php
View file

@ -386,7 +386,7 @@ foreach($progress as $user) {
($activity->completion==COMPLETION_TRACKING_AUTOMATIC ? 'auto' : 'manual'). ($activity->completion==COMPLETION_TRACKING_AUTOMATIC ? 'auto' : 'manual').
'-'.$completiontype; '-'.$completiontype;
$describe=get_string('completion-alt-auto-'.$completiontype,'completion'); $describe = get_string('completion-' . $completiontype, 'completion');
$a=new StdClass; $a=new StdClass;
$a->state=$describe; $a->state=$describe;
$a->date=$date; $a->date=$date;