Index: openacs-4/packages/acs-lang/www/admin/message-list-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/Attic/message-list-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-lang/www/admin/message-list-postgresql.xql	11 Dec 2003 21:39:53 -0000	1.2
+++ openacs-4/packages/acs-lang/www/admin/message-list-postgresql.xql	16 Feb 2004 15:28:37 -0000	1.3
@@ -17,8 +17,6 @@
     and    lm1.package_key = :package_key
     and    lm1.message_key = lmk.message_key
     and    lm1.package_key = lmk.package_key
-    and    (lm2.deleted_p = 'f' or lm2.deleted_p is null)
-    and    lm1.deleted_p = 'f'
     $where_clause
     order  by upper(lm1.message_key), lm1.message_key
 
Index: openacs-4/packages/acs-lang/www/admin/message-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-list.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-lang/www/admin/message-list.tcl	11 Dec 2003 21:39:53 -0000	1.6
+++ openacs-4/packages/acs-lang/www/admin/message-list.tcl	16 Feb 2004 15:28:37 -0000	1.7
@@ -12,8 +12,8 @@
     {show "all"}
 } -validate {
     show_valid -requires { show } {
-        if { [lsearch { all translated untranslated } $show] == -1 } {
-            ad_complain "Show must be one of 'all', 'translated', or 'untranslated'."
+        if { [lsearch { all deleted translated untranslated } $show] == -1 } {
+            ad_complain "Show must be one of 'all', 'deleted', 'translated', or 'untranslated'."
         }
     }
 }
@@ -50,8 +50,9 @@
 
 db_1row counts {
     select (select count(*) from lang_messages where package_key = :package_key and locale = :locale) as num_translated,
-           (select count(*) from lang_message_keys where package_key = :package_key) as num_messages
-    from   dual
+           (select count(*) from lang_message_keys where package_key = :package_key) as num_messages,
+    (select count(*) from lang_messages where package_key = :package_key and locale = :locale and deleted_p = 't') as num_deleted
+
 }
 set num_untranslated [expr $num_messages - $num_translated]
 
@@ -77,10 +78,17 @@
 switch -exact $show {
     translated {
         lappend where_clauses {lm2.message is not null}
+        lappend where_clauses {(lm2.deleted_p = 'f' or lm2.deleted_p is null)}
+        lappend where_clauses {lm1.deleted_p = 'f'}
     }
     untranslated {
+        lappend where_clauses {(lm2.deleted_p = 'f' or lm2.deleted_p is null)}
+        lappend where_clauses {lm1.deleted_p = 'f'}
         lappend where_clauses {lm2.message is null}
     }
+    deleted {
+        lappend where_clauses {lm1.deleted_p = 't'}
+    }
 }
 
 if { [llength $where_clauses] == 0 } {
@@ -117,6 +125,7 @@
 multirow append show_opts "all" "All" $num_messages_pretty
 multirow append show_opts "translated" "Translated" $num_translated_pretty
 multirow append show_opts "untranslated" "Untranslated" $num_untranslated_pretty
+multirow append show_opts "deleted" "Deleted" $num_deleted
 
 multirow extend show_opts url selected_p