Index: openacs-4/packages/contacts/lib/contacts.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contacts.tcl,v
diff -u -r1.41 -r1.42
--- openacs-4/packages/contacts/lib/contacts.tcl	3 Feb 2006 02:44:13 -0000	1.41
+++ openacs-4/packages/contacts/lib/contacts.tcl	3 Feb 2006 16:53:41 -0000	1.42
@@ -265,7 +265,7 @@
 foreach attribute $attr_val_name {
     set attr_id   [lindex $attribute 0]
     lappend row_list $attr_id [list]
-    lappend elements $attr_id [list label "[_ acs-translations.ams_attribute_${attr_id}_pretty_name]" display_template "@contacts.${attr_id};noquote@"]
+    lappend elements $attr_id [list label [attribute::pretty_name -attribute_id $attr_id] display_template "@contacts.${attr_id};noquote@"]
     lappend extend_attr $attr_id
 }
 
Index: openacs-4/packages/contacts/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/search.tcl,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/contacts/www/search.tcl	23 Nov 2005 17:29:47 -0000	1.23
+++ openacs-4/packages/contacts/www/search.tcl	3 Feb 2006 16:53:41 -0000	1.24
@@ -173,7 +173,7 @@
 	# in the list, otherwise we could have duplicated.
 	if { ![empty_string_p $attr_id] } {
 	    lappend attribute_values $attr_id
-	    lappend default_names "[_ acs-translations.ams_attribute_${attr_id}_pretty_name]"
+	    lappend default_names [attribute::pretty_name -attribute_id $attr_id]
 	}
 
 	if { [string equal [lsearch -exact $attr_val_name "[list $attr_id $attr]"] "-1"] } {
@@ -232,7 +232,8 @@
 	    set attribute $attribute_option
 	    ams::attribute::get -attribute_id $attribute -array attr_info
 	    set name $attr_info(attribute_name)
-	    lappend attribute_names "[_ acs-translations.ams_attribute_${attribute}_pretty_name]"
+	    lappend attribute_names [attribute::pretty_name -attribute_id $attribute]
+
             lappend attribute_values $attribute
 	    lappend attr_val_name [list $attribute $name]
         }
Index: openacs-4/packages/contacts/www/admin/attribute-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/attribute-list.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/www/admin/attribute-list.tcl	18 Nov 2005 17:48:27 -0000	1.2
+++ openacs-4/packages/contacts/www/admin/attribute-list.tcl	3 Feb 2006 16:53:41 -0000	1.3
@@ -81,7 +81,7 @@
     # in the list, otherwise we could have duplicated.
     if { ![empty_string_p $attr_id] } {
 	lappend attribute_values $attr_id
-	lappend default_names "[_ acs-translations.ams_attribute_${attr_id}_pretty_name]"
+	lappend default_names [attribute::pretty_name -attribute_id $attribute]
     }
 }