Index: openacs-4/packages/evaluation/lib/evaluations-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/evaluations-chunk.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/evaluation/lib/evaluations-chunk.tcl	9 Jun 2009 03:04:14 -0000	1.19
+++ openacs-4/packages/evaluation/lib/evaluations-chunk.tcl	10 Jun 2009 00:49:09 -0000	1.20
@@ -15,14 +15,8 @@
 set bulk_actions ""
 db_1row get_grade_info { *SQL* }
 
-if {[string match "#*#" $grade_plural_name]} {
-    set grade_plural_name [lang::message::lookup \
-                [ad_conn locale] [string trim $grade_plural_name "#"]]
-}
-if {[string match "#*#" $grade_name]} {
-    set grade_plural_name [lang::message::lookup \
-                [ad_conn locale] [string trim $grade_name "#"]]
-}
+set grade_plural_name [lang::util::localize $grade_plural_name]
+set grade_name [lang::util::localize $grade_name]
 set low_name $grade_plural_name
 set grade_plural_name [string toupper $grade_plural_name]
 
Index: openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl	9 Jun 2009 03:00:21 -0000	1.13
+++ openacs-4/packages/evaluation/www/admin/grades/distribution-edit.tcl	10 Jun 2009 00:47:58 -0000	1.14
@@ -24,10 +24,7 @@
 
 db_1row grade_info { *SQL* }
 
-if {[string match "#*#" $grade_plural_name]} {
-    set grade_plural_name [lang::message::lookup \
-                [ad_conn locale] [string trim $grade_plural_name "#"]]
-}
+set grade_plural_name [lang::util::localize $grade_plural_name]
 set grade_plural_name_up [string toupper $grade_plural_name]
 
 if { ![empty_string_p $set_task_id_live] } {
Index: openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl	9 Jun 2009 02:55:24 -0000	1.31
+++ openacs-4/packages/evaluation/www/admin/tasks/task-add-edit.tcl	10 Jun 2009 00:48:26 -0000	1.32
@@ -69,10 +69,7 @@
 if { !$new_p } {
 
     db_foreach select_grade_types { *SQL* } {
-        if {[string match "#*#" $grade_name]} {
-            set grade_name [lang::message::lookup [ad_conn locale] \
-                            [string trim $grade_name "#"]]
-        }
+        set grade_name [lang::util::localize $grade_name]
         lappend grade_type_options [list $grade_name $grade_item_id]
     }
     ad_form -extend -name task -form {