Index: openacs-4/packages/acs-lang/www/admin/index.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/index.xql,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/acs-lang/www/admin/index.xql	15 Apr 2019 16:34:14 -0000	1.1.2.1
+++ openacs-4/packages/acs-lang/www/admin/index.xql	23 Apr 2019 19:25:25 -0000	1.1.2.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <queryset>
 
-  <fullquery name="count_locales">
+  <fullquery name="locale_stats">
     <querytext>
 
         select
@@ -19,14 +19,15 @@
                 case when num_untranslated is null      then 0 else num_untranslated end,
                 case when num_deleted is null           then 0 else num_deleted end
             from (
-                select locale,
+                select
+                    locale,
                     count(*)                                                                    as num_messages,
                     count(message_is_not_null + messages_not_deleted)                           as num_translated,
                     count(message_is_null + default_message_not_deleted + message_not_deleted)  as num_untranslated,
                     count(any_message_deleted)                                                  as num_deleted
                 from (
                     select
-                        lm2.locale,
+                        case when lm2.locale is null                            then :current_locale else lm2.locale end locale,
                         case when lm2.message is null                           then 1 end message_is_null,
                         case when lm2.message is not null                       then 1 end message_is_not_null,
                         case when lm1.deleted_p = 't' or lm2.deleted_p = 't'    then 1 end any_message_deleted,
@@ -36,14 +37,15 @@
                     from
                         lang_messages lm1 left outer join
                         lang_messages lm2 on (
-                            lm2.message_key = lm1.message_key
+                                lm2.locale = :current_locale
+                            and lm2.message_key = lm1.message_key
                             and lm2.package_key = lm1.package_key
                         )
                     where
                         lm1.locale = :default_locale
                 ) locale_messages
                 group by locale
-            ) locale_summary right outer join
+            ) locale_summary join
               ad_locales al on
                  al.locale = locale_summary.locale
             group by