Browse files

MDL-32535 Completion lang string incorrect use, text

  • Loading branch information...
1 parent 93fb7b5 commit dc2c1b8974fe997f7b1f64e072ed33084128453b @sammarshallou sammarshallou committed Apr 19, 2012
Showing with 15 additions and 9 deletions.
  1. +10 −4 lang/en/completion.php
  2. +4 −4 report/completion/index.php
  3. +1 −1 report/progress/index.php
View
14 lang/en/completion.php
@@ -34,14 +34,18 @@
A tick next to the activity name on the course page indicates when the activity is complete.';
$string['completion_link'] = 'activity/completion';
-$string['completion-alt-auto-enabled'] = 'The system marks this item complete according to conditions';
-$string['completion-alt-auto-fail'] = 'Completed (did not achieve pass grade)';
+$string['completion-alt-auto-enabled'] = 'The system marks this item complete according to conditions: {$a}';
+$string['completion-alt-auto-fail'] = 'Completed: {$a} (did not achieve pass grade)';
$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-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-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['completiondisabled'] = 'Disabled, not shown in activity settings';
$string['completionexpected'] = 'Expect completed on';
@@ -95,6 +99,7 @@
$string['completionsettingslocked']='Completion settings locked';
$string['completionstartonenrol']='Completion tracking begins on enrolment';
$string['completionstartonenrolhelp']='Begin tracking a student\'s progress in course completion after course enrolment';
+$string['completed'] = 'Completed';
$string['confirmselfcompletion']='Confirm self completion';
$string['coursealreadycompleted']='You have already completed this course';
$string['coursecomplete']='Course complete';
@@ -125,6 +130,7 @@
$string['markedcompleteby']='Marked complete by {$a}';
$string['markingyourselfcomplete']='Marking yourself complete';
$string['moredetails']='More details';
+$string['notcompleted'] = 'Not completed';
$string['nocriteriaset']='No completion criteria set for this course';
$string['notenroled']='You are not enroled in this course';
$string['notyetstarted']='Not yet started';
View
8 report/completion/index.php
@@ -604,7 +604,7 @@ function csv_quote($value) {
($activity->completion==COMPLETION_TRACKING_AUTOMATIC ? 'auto' : 'manual').
'-'.$completiontype;
- $describe=get_string('completion-alt-auto-'.$completiontype,'completion');
+ $describe = get_string('completion-' . $completiontype, 'completion');
$a=new StdClass;
$a->state=$describe;
$a->date=$date;
@@ -633,7 +633,7 @@ function csv_quote($value) {
$completiontype = $is_complete ? 'y' : 'n';
$completionicon = 'completion-auto-'.$completiontype;
- $describe = get_string('completion-alt-auto-'.$completiontype, 'completion');
+ $describe = get_string('completion-' . $completiontype, 'completion');
$a = new stdClass();
$a->state = $describe;
@@ -647,7 +647,7 @@ function csv_quote($value) {
} else {
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">'.
'<a href="'.$CFG->wwwroot.'/course/togglecompletion.php?user='.$user->id.'&amp;course='.$course->id.'&amp;rolec='.$allow_marking_criteria.'&amp;sesskey='.sesskey().'">'.
@@ -672,7 +672,7 @@ function csv_quote($value) {
$ccompletion = new completion_completion($params);
$completiontype = $ccompletion->is_complete() ? 'y' : 'n';
- $describe = get_string('completion-alt-auto-'.$completiontype, 'completion');
+ $describe = get_string('completion-' . $completiontype, 'completion');
$a = new StdClass;
$a->state = $describe;
View
2 report/progress/index.php
@@ -388,7 +388,7 @@ function csv_quote($value) {
($activity->completion==COMPLETION_TRACKING_AUTOMATIC ? 'auto' : 'manual').
'-'.$completiontype;
- $describe=get_string('completion-alt-auto-'.$completiontype,'completion');
+ $describe = get_string('completion-' . $completiontype, 'completion');
$a=new StdClass;
$a->state=$describe;
$a->date=$date;

0 comments on commit dc2c1b8

Please sign in to comment.