Index: openacs-4/packages/acs-admin/www/apm/packages-install-4.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install-4.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-admin/www/apm/packages-install-4.tcl 13 Mar 2001 22:59:26 -0000 1.1 +++ openacs-4/packages/acs-admin/www/apm/packages-install-4.tcl 19 Dec 2002 16:06:59 -0000 1.2 @@ -12,6 +12,7 @@ set pkg_install_list [ad_get_client_property apm pkg_install_list] set pkg_enable_list [ad_get_client_property apm pkg_enable_list] set sql_file_paths [ad_get_client_property apm sql_file_paths] +set catalog_file_paths [ad_get_client_property apm catalog_file_paths] set install_path [ad_get_client_property apm install_path] set copy_files_p [ad_get_client_property apm copy_files_p] @@ -56,20 +57,31 @@ lappend data_model_files $file } } - + + set message_catalog_files [list] + # Find the message catalog files for the package + foreach file $catalog_file_paths { + if { [string equal [lindex $file 1] $package_key] } { + # We only need a list of file paths relative to package root + lappend message_catalog_files [lindex $file 0] + } + } + # Install the packages. ns_log Debug "APM: Installing packages from $install_path." if {$copy_files_p} { set version_id [apm_package_install -install_path $install_path \ -callback apm_ns_write_callback -copy_files -load_data_model \ - -data_model_files $data_model_files $spec_file] + -data_model_files $data_model_files -message_catalog_files $message_catalog_files \ + $spec_file] if {$version_id != 0} { file delete -force $install_path/$package_key } } else { set version_id [apm_package_install -install_path $install_path \ -callback apm_ns_write_callback -load_data_model \ - -data_model_files $data_model_files $spec_file] + -data_model_files $data_model_files -message_catalog_files $message_catalog_files \ + $spec_file] } if { ($version_id != 0) && ([lsearch -exact $pkg_enable_list $package_key] != -1) } { apm_version_enable -callback apm_ns_write_callback $version_id