Merge branch 'MDL-48205_master' of https://github.com/totara/openbadges

This commit is contained in:
Eloy Lafuente (stronk7) 2015-04-07 14:20:48 +02:00
commit 037546ae1f
2 changed files with 3 additions and 3 deletions

View File

@ -86,7 +86,7 @@ class award_criteria_activity extends award_criteria {
if (!$mod) {
$str = $OUTPUT->error_text(get_string('error:nosuchmod', 'badges'));
} else {
$str = html_writer::tag('b', '"' . ucfirst($mod->modname) . ' - ' . $mod->name . '"');
$str = html_writer::tag('b', '"' . get_string('modulename', $mod->modname) . ' - ' . $mod->name . '"');
if (isset($p['bydate'])) {
$str .= get_string('criteria_descr_bydate', 'badges', userdate($p['bydate'], get_string('strftimedate', 'core_langconfig')));
}
@ -139,7 +139,7 @@ class award_criteria_activity extends award_criteria {
}
$param = array('id' => $mod->id,
'checked' => $checked,
'name' => ucfirst($mod->modname) . ' - ' . $mod->name,
'name' => get_string('modulename', $mod->modname) . ' - ' . $mod->name,
'error' => false
);

View File

@ -164,7 +164,7 @@ class award_criteria_courseset extends award_criteria {
$param = array(
'id' => $course->id,
'checked' => true,
'name' => ucfirst(format_string($course->fullname, true, array('context' => $coursecontext))),
'name' => format_string($course->fullname, true, array('context' => $coursecontext)),
'error' => false
);