Index: openacs-4/packages/acs-lang/www/admin/batch-editor.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/batch-editor.tcl,v
diff -u -r1.13.2.2 -r1.13.2.3
--- openacs-4/packages/acs-lang/www/admin/batch-editor.tcl	31 Aug 2021 11:49:00 -0000	1.13.2.2
+++ openacs-4/packages/acs-lang/www/admin/batch-editor.tcl	4 Oct 2021 10:21:52 -0000	1.13.2.3
@@ -136,7 +136,26 @@
 
 set count $page_start
 array set sections {}
-db_foreach get_messages {} {
+db_foreach get_messages [subst -nocommands {
+    select lm1.message_key,
+           lm1.package_key,
+           lm1.message as default_message,
+           lm2.message as translated_message,
+           lmk.description
+    from   lang_messages lm1 left outer join
+           lang_messages lm2 on (lm2.locale = :locale
+                                 and lm2.message_key = lm1.message_key
+                                 and lm2.package_key = lm1.package_key),
+           lang_message_keys lmk
+    where  lm1.locale = :default_locale
+    and    lm1.package_key = :package_key
+    and    lm1.message_key = lmk.message_key
+    and    lm1.package_key = lmk.package_key
+    $where_clause
+    order  by upper(lm1.message_key), lm1.message_key
+    offset :page_start
+    fetch first 10 rows only
+}] {
     ad_form -extend -name batch_editor -form \
         [list [list "message_key_$count:text(hidden)" {value $message_key}]]