Index: openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl,v diff -u -r1.25 -r1.26 --- openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl 18 Sep 2003 11:57:58 -0000 1.25 +++ openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl 18 Sep 2003 14:58:10 -0000 1.26 @@ -603,7 +603,7 @@ if { ![file exists [package_catalog_dir $package_key]] } { continue } - + import_from_files -restrict_to_locale $locale $package_key } } @@ -627,6 +627,12 @@ error "lang::catalog::import_from_files - the package_key argument is the empty string" } + # Skip the package if it has no catalog files at all + if { ![file exists [package_catalog_dir $package_key]] } { + ns_log Notice "lang::catalog::import_from_files - importing nothing as package $package_key has no catalog files" + return + } + # Get all catalog files for enabled locales set catalog_file_list [list] db_foreach select_locales { @@ -661,7 +667,7 @@ if { [file exists $alternate_file_path] } { lappend catalog_file_list $alternate_file_path } else { - set error_text "lang::catalog::import_from_files - No catalog file found for locale $locale and charset ${mime_charset} (defaulted to $charset as $mime_charset is unsupported). Attempted both path $file_path and $alternate_file_path" + set error_text "lang::catalog::import_from_files - No catalog file found for locale $locale and charset ${mime_charset}. Attempted both path $file_path and $alternate_file_path" if { ![string equal $charset $mime_charset] } { append error_text " (defaulted to $charset as $mime_charset is unsupported)" }