From a7b696ef381ba560baca0a5018746307b17ac869 Mon Sep 17 00:00:00 2001 From: pichetp Date: Thu, 8 Mar 2007 07:02:53 +0000 Subject: [PATCH] merge from 18 STABLE MDL-8809 --- question/type/datasetdependent/abstractqtype.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/question/type/datasetdependent/abstractqtype.php b/question/type/datasetdependent/abstractqtype.php index 4f4a0fbca92..d536ad5f6ab 100644 --- a/question/type/datasetdependent/abstractqtype.php +++ b/question/type/datasetdependent/abstractqtype.php @@ -1,5 +1,6 @@ type == $type and $currentdatasetdef->category == 0) { - $options[$key] = get_string("keptlocal$type", 'quiz'); + $options[$key] = get_string($prefix."keptlocal$type", $langfile); } else { - $options[$key] = get_string("newlocal$type", 'quiz'); + $options[$key] = get_string($prefix."newlocal$type", $langfile); } } @@ -635,12 +636,12 @@ class question_dataset_dependent_questiontype extends default_questiontype { and $categorydef = $categorydatasetdefs[$type]) { if ($currentdatasetdef->type == $type and $currentdatasetdef->id == $categorydef->id) { - $options[$key] = get_string("keptcategory$type", 'quiz'); + $options[$key] = get_string($prefix."keptcategory$type", $langfile); } else { - $options[$key] = get_string("existingcategory$type", 'quiz'); + $options[$key] = get_string($prefix."existingcategory$type", $langfile); } } else { - $options[$key] = get_string("newcategory$type", 'quiz'); + $options[$key] = get_string($prefix."newcategory$type", $langfile); } }