Index: openacs-4/packages/acs-lang/www/admin/package-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/package-list.tcl,v
diff -u -N -r1.14 -r1.14.2.1
--- openacs-4/packages/acs-lang/www/admin/package-list.tcl	28 Nov 2018 11:06:33 -0000	1.14
+++ openacs-4/packages/acs-lang/www/admin/package-list.tcl	11 Apr 2019 18:36:41 -0000	1.14.2.1
@@ -9,7 +9,7 @@
 } {
     locale
 } -properties {
-    locale_label
+    current_locale_label
     page_title
     context
     current_locale
@@ -18,74 +18,57 @@
     search_form
 }
 
+# SWA?
+set site_wide_admin_p [acs_user::site_wide_admin_p]
+
 # We rename to avoid conflict in queries
 set current_locale $locale
+set current_locale_label [lang::util::get_label $current_locale]
 set default_locale en_US
-
-set locale_label [lang::util::get_label $current_locale]
 set default_locale_label [lang::util::get_label $default_locale]
-
-set page_title $locale_label
-set context [list $page_title]
-
+set default_locale_p [string equal $current_locale $default_locale]
 set locale_enabled_p [expr {[lsearch [lang::system::get_locales] $current_locale] != -1}]
-set site_wide_admin_p [acs_user::site_wide_admin_p]
 
+# URLs
+set import_all_url [export_vars -base import-messages { { locale $current_locale } {return_url {[ad_return_url]}} }]
+set export_all_url [export_vars -base export-messages { { locale $current_locale } {return_url {[ad_return_url]}} }]
 
+# Page title and context
+set page_title $current_locale_label
+set context [list $page_title]
 
-
-#####
-#
 # Package/message list
-#
-#####
+if { $default_locale_p } {
+    set multirow packages_locale_status_default
+} else {
+    set multirow packages_locale_status
+}
 
-db_multirow -extend { 
+# Package/message list
+db_multirow -extend {
     num_messages_pretty
     num_translated_pretty
-    num_untranslated
     num_untranslated_pretty
+    num_deleted_pretty
     batch_edit_url
     view_messages_url
     view_translated_url
+    view_deleted_url
     view_untranslated_url
-} packages select_packages {
-    select q.*,
-           (select count(*) 
-            from   lang_messages lm 
-            where  lm.package_key = q.package_key
-            and    lm.locale = :current_locale
-            and    lm.deleted_p = 'f') as num_translated
-    from   (select lmk.package_key,
-                   count(message_key) as num_messages
-            from   lang_messages lmk
-            where  lmk.locale = :default_locale and lmk.deleted_p = 'f' 
-            group  by package_key) q
-    order  by package_key
-} {
-    set num_untranslated [expr {$num_messages - $num_translated}]
-
-    set num_messages_pretty [lc_numeric $num_messages]
-    set num_translated_pretty [lc_numeric $num_translated]
+} packages $multirow {} {
+    set num_messages_pretty     [lc_numeric $num_messages]
+    set num_translated_pretty   [lc_numeric $num_translated]
     set num_untranslated_pretty [lc_numeric $num_untranslated]
+    set num_deleted_pretty      [lc_numeric $num_deleted]
 
-    set batch_edit_url [export_vars -base batch-editor { locale package_key }]
-    set view_messages_url [export_vars -base message-list { locale package_key }]
-    set view_translated_url [export_vars -base message-list { locale package_key { show "translated" } }]
-    set view_untranslated_url [export_vars -base message-list { locale package_key { show "untranslated" } }]
+    set batch_edit_url          [export_vars -base batch-editor { locale package_key }]
+    set view_messages_url       [export_vars -base message-list { locale package_key }]
+    set view_translated_url     [export_vars -base message-list { locale package_key { show "translated" } }]
+    set view_deleted_url        [export_vars -base message-list { locale package_key { show "deleted" } }]
+    set view_untranslated_url   [export_vars -base message-list { locale package_key { show "untranslated" } }]
 }
 
-
-
-
-
-
-#####
-#
 # Search form
-#
-#####
-
 set search_locales [list \
                         [list "Current locale - [lang::util::get_label $current_locale]" $current_locale] \
                         [list "Master locale - [lang::util::get_label $default_locale]" $default_locale]]
@@ -110,15 +93,11 @@
 }
 
 ad_form -extend -name search -form {
-    {q:text 
+    {q:text
         {label "Search for"}
     }
 }
 
-
-set import_all_url [export_vars -base import-messages { { locale $current_locale } {return_url {[ad_return_url]}} }]
-set export_all_url [export_vars -base export-messages { { locale $current_locale } {return_url {[ad_return_url]}} }]
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4