Index: openacs-4/packages/acs-subsite/www/admin/applications/index-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/index-oracle.xql,v diff -u -r1.2.18.2 -r1.2.18.3 --- openacs-4/packages/acs-subsite/www/admin/applications/index-oracle.xql 26 Sep 2015 11:21:22 -0000 1.2.18.2 +++ openacs-4/packages/acs-subsite/www/admin/applications/index-oracle.xql 27 Apr 2017 15:55:19 -0000 1.2.18.3 @@ -8,11 +8,18 @@ select n.node_id from site_nodes n, - apm_packages p, + apm_packages p + left outer join lang_messages m + on m.locale = :locale and + '#' || m.package_key || '.' || m.message_key || '#' = p.instance_name + left outer join lang_messages md + on m.locale = 'en_US' and + '#' || md.package_key || '.' || md.message_key || '#' = p.instance_name, apm_package_types pt where n.parent_id = :subsite_node_id and p.package_id = n.object_id and pt.package_key = p.package_key + and [template::list::filter_where_clauses -and -name applications] order by lower(p.instance_name) @@ -27,15 +34,14 @@ p.instance_name, pt.pretty_name as package_pretty_name, 0 as treelevel, - (select count(*) from apm_parameters par where par.package_key = pt.package_key) as num_parameters + (select count(*) from apm_parameters par where par.package_key = pt.package_key) as parameters_p from site_nodes n, apm_packages p, apm_package_types pt where n.parent_id = :subsite_node_id and p.package_id = n.object_id and pt.package_key = p.package_key and [template::list::page_where_clause -name applications -key n.node_id] - [template::list::filter_where_clauses -and -name applications] order by lower(p.instance_name)