From cfc3392582a261ae035ea13de2c0826d35e6d9ec Mon Sep 17 00:00:00 2001
From: Sam Marshall <s.marshall@open.ac.uk>
Date: Mon, 18 Oct 2010 10:15:37 +0000
Subject: [PATCH] MDL-24714: Completion report names inconsistent

---
 course/report/completion/index.php | 2 +-
 course/report/completion/mod.php   | 2 +-
 course/report/progress/index.php   | 2 +-
 course/report/progress/mod.php     | 2 +-
 lang/en/completion.php             | 9 +++------
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/course/report/completion/index.php b/course/report/completion/index.php
index 382bcfdb520..631ad023c6e 100644
--- a/course/report/completion/index.php
+++ b/course/report/completion/index.php
@@ -159,7 +159,7 @@ if ($csv) {
 
 } else {
     // Navigation and header
-    $strcompletion = get_string('completionreport','completion');
+    $strcompletion = get_string('coursecompletion');
 
     $PAGE->set_title($strcompletion);
     $PAGE->set_heading($course->fullname);
diff --git a/course/report/completion/mod.php b/course/report/completion/mod.php
index 90359a0ac34..12e47ca2230 100644
--- a/course/report/completion/mod.php
+++ b/course/report/completion/mod.php
@@ -8,7 +8,7 @@
         $completion = new completion_info($course);
         if ($completion->is_enabled() && $completion->has_criteria()) {
             echo '<p>';
-            echo '<a href="'.$CFG->wwwroot.'/course/report/completion/index.php?coursetest='.$course->id.'">'.get_string('coursecompletionreport','completion').'</a>';
+            echo '<a href="'.$CFG->wwwroot.'/course/report/completion/index.php?coursetest='.$course->id.'">'.get_string('coursecompletion').'</a>';
             echo '</p>';
         }
     }
diff --git a/course/report/progress/index.php b/course/report/progress/index.php
index e18be6cd385..374c33080ec 100644
--- a/course/report/progress/index.php
+++ b/course/report/progress/index.php
@@ -140,7 +140,7 @@ if($csv) {
 
     // Navigation and header
     $strreports = get_string("reports");
-    $strcompletion = get_string('completionreport','completion');
+    $strcompletion = get_string('activitycompletion', 'completion');
 
     $PAGE->set_title($strcompletion);
     $PAGE->set_heading($course->fullname);
diff --git a/course/report/progress/mod.php b/course/report/progress/mod.php
index e8bbadce1eb..86d0e0b16df 100644
--- a/course/report/progress/mod.php
+++ b/course/report/progress/mod.php
@@ -8,7 +8,7 @@
         $completion = new completion_info($course);
         if ($completion->is_enabled()) {
             echo '<p>';
-            echo '<a href="'.$CFG->wwwroot.'/course/report/progress/?course='.$course->id.'">'.get_string('completionreport','completion').'</a>';
+            echo '<a href="'.$CFG->wwwroot.'/course/report/progress/?course='.$course->id.'">'.get_string('activitycompletion', 'completion').'</a>';
             echo '</p>';
         }
     }
diff --git a/lang/en/completion.php b/lang/en/completion.php
index f09f0f189f6..1d703462bc1 100644
--- a/lang/en/completion.php
+++ b/lang/en/completion.php
@@ -45,7 +45,7 @@ $string['completion-alt-manual-y'] = 'Completed; select to mark as not complete'
 $string['completion_automatic'] = 'Show activity as complete when conditions are met';
 $string['completiondisabled'] = 'Disabled, not shown in activity settings';
 $string['completionexpected'] = 'Expect completed on';
-$string['completionexpected_help']='This setting specifies the date when the activity is expected to be completed. The date is not shown to students and is only displayed in the progress report.';
+$string['completionexpected_help']='This setting specifies the date when the activity is expected to be completed. The date is not shown to students and is only displayed in the activity completion report.';
 $string['completionicons'] = 'Completion tick boxes';
 $string['completionicons_help'] = 'A tick next an activity name may be used to indicate when the activity is complete.
 
@@ -54,7 +54,6 @@ If a dotted tick is shown, you can click it to tick the box when you think you h
 If a blank tick box is shown, a tick will appear automatically when you have completed the activity according to conditions set by the teacher.';
 $string['completion_manual'] = 'Students can manually mark the activity as completed';
 $string['completion_none'] = 'Do not indicate activity completion';
-$string['completionreport'] = 'Completion progress report';
 $string['completion-title-manual-n'] = 'Mark as complete';
 $string['completion-title-manual-y'] = 'Mark as not complete';
 $string['completionusegrade'] = 'Require grade';
@@ -82,7 +81,6 @@ $string['yourprogress'] = 'Your progress';
 $string['achievinggrade']='Achieving grade';
 $string['activities']='Activities';
 $string['activitiescompleted']='Activities completed';
-$string['activitycompletionreport']='Activity completion progress report';
 $string['addcourseprerequisite']='Add course prerequisite';
 $string['afterspecifieddate']='After specified date';
 $string['aggregationmethod']='Aggregation method';
@@ -96,9 +94,8 @@ $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['confirmselfcompletion']='Confirm self completion';
-$string['coursecomplete']='Course Complete';
-$string['coursecompleted']='Course Completed';
-$string['coursecompletionreport']='Course completion progress report';
+$string['coursecomplete']='Course complete';
+$string['coursecompleted']='Course completed';
 $string['coursegrade']='Course grade';
 $string['courseprerequisites']='Course prerequisites';
 $string['coursesavailable']='Courses available';