MDL-27818 question bank: multilang category names don't work.

This commit is contained in:
Tim Hunt 2012-08-29 22:43:28 +01:00
parent 34bc5e2f3a
commit fc51c2bce2
2 changed files with 12 additions and 7 deletions

View File

@ -1117,16 +1117,18 @@ function question_category_options($contexts, $top = false, $currentcat = 0,
// sort cats out into different contexts
$categoriesarray = array();
foreach ($pcontexts as $pcontext) {
$contextstring = print_context_name(
context::instance_by_id($pcontext), true, true);
foreach ($pcontexts as $contextid) {
$context = context::instance_by_id($contextid);
$contextstring = $context->get_context_name(true, true);
foreach ($categories as $category) {
if ($category->contextid == $pcontext) {
if ($category->contextid == $contextid) {
$cid = $category->id;
if ($currentcat != $cid || $currentcat == 0) {
$countstring = !empty($category->questioncount) ?
" ($category->questioncount)" : '';
$categoriesarray[$contextstring][$cid] = $category->indentedname.$countstring;
$categoriesarray[$contextstring][$cid] =
format_string($category->indentedname, true,
array('context' => $context)) . $countstring;
}
}
}

View File

@ -102,9 +102,12 @@ class question_category_list_item extends list_item {
/// Each section adds html to be displayed as part of this list item
$questionbankurl = new moodle_url("/question/edit.php", ($this->parentlist->pageurl->params() + array('category'=>"$category->id,$category->contextid")));
$catediturl = $this->parentlist->pageurl->out(true, array('edit' => $this->id));
$item = "<b><a title=\"{$str->edit}\" href=\"$catediturl\">".$category->name ."</a></b> <a title=\"$editqestions\" href=\"$questionbankurl\">".'('.$category->questioncount.')</a>';
$item = "<b><a title=\"{$str->edit}\" href=\"$catediturl\">" .
format_string($category->name, true, array('context' => $this->parentlist->context)) .
"</a></b> <a title=\"$editqestions\" href=\"$questionbankurl\">".'('.$category->questioncount.')</a>';
$item .= '&nbsp;'. $category->info;
$item .= '&nbsp;' . format_text($category->info, $category->infoformat,
array('context' => $this->parentlist->context, 'noclean' => true));
// don't allow delete if this is the last category in this context.
if (count($this->parentlist->records) != 1) {