Index: openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl,v
diff -u -r1.49 -r1.49.2.1
--- openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl	13 Aug 2007 11:13:45 -0000	1.49
+++ openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl	6 Mar 2008 06:57:47 -0000	1.49.2.1
@@ -771,14 +771,18 @@
                     if { [message_exists_p $locale $key] } {
                         set message [nsv_get lang_message_$locale $key]
                     } else {
-			if {[string match "acs-translations.*" $key]} {
-			    ns_log Debug "lang::message::lookup: Key '$key' does not exist in en_US"
-			    set message "MESSAGE KEY MISSING: '$key'"
+			if {"TRANSLATION MISSING" != $default} {
+			    set message $default
 			} else {
-			    ns_log Error "lang::message::lookup: Key '$key' does not exist in en_US"
-			    set message "MESSAGE KEY MISSING: '$key'"
+			    if {[string match "acs-translations.*" $key]} {
+				ns_log Debug "lang::message::lookup: Key '$key' does not exist in en_US"
+				set message "MESSAGE KEY MISSING: '$key'"
+			    } else {
+				ns_log Error "lang::message::lookup: Key '$key' does not exist in en_US"
+				set message "MESSAGE KEY MISSING: '$key'"
+			    }
 			}
-                    }
+		    }
                 }
             }
         }