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.32 -r1.33
--- openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl	16 Oct 2003 10:50:12 -0000	1.32
+++ openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl	16 Oct 2003 15:17:01 -0000	1.33
@@ -682,7 +682,7 @@
 
         foreach file_path $catalog_files {
             # Use a catch so that parse failure of one file doesn't cause the import of all files to fail
-            if { [catch {import_messages_from_file $file_path} errMsg] } {
+            if { [catch {import_from_file $file_path} errMsg] } {
                 global errorInfo
                 
                 ns_log Error "The import of file $file_path failed, error message is:\n\n${errMsg}\n\nstack trace:\n\n$errorInfo\n\n"
@@ -709,8 +709,8 @@
     @author Peter Marklund
 } {
     # We always need to register en_US messages first as they create the keys
-    set en_us_locale_list [list [list en_US [ad_locale charset en_US]]]
-    set other_locales_list [db_list_of_lists locales_and_charsets {
+    set en_us_locale_list [list en_US]
+    set other_locales_list [db_list locales {
         select locale
         from ad_locales
         where enabled_p = 't'
@@ -723,7 +723,7 @@
     foreach locale $locales_list {        
 
         # If we are only processing certain locales and this is not one of them - continue
-        if { [llength $locales] > 0 && [lsearch $locales $locale] == -1 } {
+        if { [llength $locales] > 0 && [lsearch -exact $locales $locale] == -1 } {
             continue
         }