Merge branch 'MDL-41248' of git://github.com/timhunt/moodle

moodle · Mar 5, 2014 · 3be87d8 · 3be87d8
2 parents 23d142e + 8d3debf
commit 3be87d8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/completion/criteria/completion_criteria_duration.php b/completion/criteria/completion_criteria_duration.php
@@ -165,7 +165,7 @@ public function get_title() {
      * @return string
      */
     public function get_title_detailed() {
-        return ceil($this->enrolperiod / (60 * 60 * 24)) . ' days';
+        return get_string('xdays', 'completion', ceil($this->enrolperiod / (60 * 60 * 24)));
     }
 
     /**
@@ -190,7 +190,8 @@ public function get_status($completion) {
 
         $daysleft = ceil($timeleft / (60 * 60 * 24));
 
-        return ($daysleft > 0 ? $daysleft : 0).' of '.$enrolperiod;
+        return get_string('daysoftotal', 'completion', array(
+                'days' => $daysleft > 0 ? $daysleft : 0, 'total' => $enrolperiod));
     }
 
     /**

diff --git a/lang/en/completion.php b/lang/en/completion.php
@@ -111,6 +111,7 @@
 $string['csvdownload'] = 'Download in spreadsheet format (UTF-8 .csv)';
 $string['datepassed'] = 'Date passed';
 $string['days'] = 'Days';
+$string['daysoftotal'] = '{$a->days} of {$a->total}';
 $string['deletecompletiondata'] = 'Delete completion data';
 $string['dependencies'] = 'Dependencies';
 $string['dependenciescompleted'] = 'Completion of other courses';