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 -N -r1.68.2.9 -r1.68.2.10
--- openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl	21 Jul 2020 14:02:09 -0000	1.68.2.9
+++ openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl	25 Aug 2020 13:38:12 -0000	1.68.2.10
@@ -97,6 +97,7 @@
     {-upgrade_status "no_upgrade"}
     {-conflict:boolean}
     {-comment ""}
+    {-object_id ""}
     locale
     package_key
     message_key
@@ -140,6 +141,10 @@
     @param conflict         Set this switch if the upgrade represents a conflict between
                             changes made in the database and in catalog files.
 
+    @param object_id        Bind this message key to an acs_object, so that
+                            upon deletion, the message key will be
+                            removed as well.
+
     @see lang::message::lookup
     @see _
 } {
@@ -162,7 +167,12 @@
 
     if { ! $key_exists_p } {
         if {$locale eq "en_US"} {
-            db_dml insert_message_key {}
+            db_dml insert_message_key {
+                insert into lang_message_keys
+                (message_key, package_key, object_id)
+                values
+                (:message_key, :package_key, :object_id)
+            }
         } else {
             # Non-default locale
             # The system will not function correctly if there are keys registered in other locales