Index: openacs-4/packages/acs-lang/tcl/lang-catalog-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-catalog-procs.xql,v diff -u -r1.7 -r1.8 --- openacs-4/packages/acs-lang/tcl/lang-catalog-procs.xql 21 Jan 2003 21:37:10 -0000 1.7 +++ openacs-4/packages/acs-lang/tcl/lang-catalog-procs.xql 18 Aug 2003 08:01:36 -0000 1.8 @@ -7,11 +7,13 @@ from apm_package_types where exists (select 1 from apm_package_versions - where installed_p = 't' - and enabled_p = 't') + where package_key = apm_package_types.package_key + and installed_p = 't' + and enabled_p = 't') and not exists (select 1 from lang_message_keys where package_key = apm_package_types.package_key) + and package_key = 'dotlrn' @@ -25,15 +27,16 @@ - select message_key, message - from lang_messages - where package_key = :package_key - and locale = :locale - and not exists (select 1 from lang_message_keys - where message_key = lang_messages.message_key - and package_key = lang_messages.package_key - and upgrade_status = 'deleted' - ) + select lm.message_key, + lm.message, + lmk.description + from lang_messages lm, + lang_message_keys lmk + where lm.message_key = lmk.message_key + and lm.package_key = lmk.package_key + and lm.package_key = :package_key + and lm.locale = :locale + and lmk.upgrade_status != 'deleted'