Index: openacs-4/packages/ams/www/list-code.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ams/www/list-code.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ams/www/list-code.tcl 28 May 2005 15:37:27 -0000 1.4 +++ openacs-4/packages/ams/www/list-code.tcl 7 Jun 2005 07:44:14 -0000 1.5 @@ -26,24 +26,34 @@ regsub -all {"} $list_info(description) {\"} list_info(description) -db_multirow -extend {message_key true_pretty true_plural} -unclobber attributes select_mapped_attributes { +db_multirow -extend {message_key option_key true_pretty true_plural true_option} -unclobber attributes select_mapped_attributes { select alam.required_p, alam.section_heading, alam.sort_order as list_sort_order, + aot.option_id, + aot.option, ams.* from ams_list_attribute_map alam, ams_attributes ams + left outer join ams_option_types aot on (ams.attribute_id=aot.attribute_id) where alam.list_id = :list_id and alam.attribute_id = ams.attribute_id order by alam.sort_order } { regsub -all {"} $section_heading {\"} section_heading set message_key "${object_type}_${attribute_name}" - set pretty_name ams.$message_key - set pretty_plural ams.${message_key}_plural - set true_pretty [lang::message::lookup en_US ams.$message_key] - set true_plural [lang::message::lookup en_US ams.${message_key}_plural] + set option_key "${message_key}_[lang::util::suggest_key $option]" + set pretty_name "acs-translation.$message_key" + set pretty_plural "acs-translation.${message_key}_plural" + set true_pretty [lang::message::lookup en_US acs-translations.$message_key] + set true_plural [lang::message::lookup en_US acs-translations.${message_key}_plural] + set true_option $option + set option "acs-translation.$option_key" +# set true_option [lang::message::lookup en_US acs-translations.$option_key] } + + + ad_return_template