Index: openacs-4/packages/acs-lang/www/admin/batch-editor.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/batch-editor.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-lang/www/admin/batch-editor.adp	7 Aug 2017 23:47:57 -0000	1.10
+++ openacs-4/packages/acs-lang/www/admin/batch-editor.adp	1 Dec 2017 18:11:42 -0000	1.11
@@ -13,22 +13,22 @@
 <p>
   Show: 
   <multiple name="show_opts">
-    <if @show_opts.rownum@ gt 1> | </if>
+    <if @show_opts.rownum;literal@ gt 1> | </if>
     <if @show_opts.selected_p;literal@ true><strong>@show_opts.label@ (@show_opts.count@)</strong> </if>
     <else><a href="@show_opts.url@">@show_opts.label@ (@show_opts.count@)</a> </else>
   </multiple>
 </p>
 
-<if @total@ eq 0>
+<if @total;literal@ eq 0>
   <em>No messages</em>
 </if>
 <else>
-  <if @pagination:rowcount@ ne "1">
+  <if @pagination:rowcount;literal@ ne "1">
       <table class="plain">
         <multiple name="pagination">
           <tr>
             <group column="group">    
-              <if @pagination.selected@ eq "1">
+              <if @pagination.selected;literal@ eq "1">
                 <td class="high"><strong>@pagination.text@</strong>
               </if>
               <else>
@@ -45,12 +45,12 @@
   <!-- TODO: Remove 'style' when we've merged 4.6.4 back onto HEAD -->
   <formtemplate id="batch_editor"></formtemplate>
 
-  <if @pagination:rowcount@ ne "1">
+  <if @pagination:rowcount;literal@ ne "1">
       <table class="plain">
         <multiple name="pagination">
           <tr>
             <group column="group">    
-              <if @pagination.selected@ eq "1">
+              <if @pagination.selected;literal@ true">
                 <td class="high"><strong>@pagination.text@</strong>
               </if>
               <else>
Index: openacs-4/packages/acs-lang/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/index.adp,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/acs-lang/www/admin/index.adp	7 Aug 2017 23:47:57 -0000	1.21
+++ openacs-4/packages/acs-lang/www/admin/index.adp	1 Dec 2017 18:11:42 -0000	1.22
@@ -51,8 +51,8 @@
       <td>
         <a href="@locales.msg_edit_url@" title="#acs-lang.Edit_localized_messages_for#">@locales.locale_label@</a>
       </td>
-      <td align="right"><if @locales.num_translated_pretty@ ne 0>@locales.num_translated_pretty@</if></td>
-      <td align="right"><if @locales.enabled_p@ true or @locales.num_translated@ gt 0><if @locales.num_untranslated_pretty@ ne 0>@locales.num_untranslated_pretty@</if></if></td>
+      <td align="right"><if @locales.num_translated_pretty;literal@ ne 0>@locales.num_translated_pretty@</if></td>
+      <td align="right"><if @locales.enabled_p;literal@ true or @locales.num_translated;literal@ gt 0><if @locales.num_untranslated_pretty;literal@ ne 0>@locales.num_untranslated_pretty@</if></if></td>
       <td align="center">
         <if @locales.enabled_p;literal@ true>
           <a href="@locales.locale_enabled_p_url@" title="#acs-lang.Disable_this_locale#"><img src="/resources/acs-subsite/checkboxchecked.gif" height="13" width="13" style="border:0; background-color: white;" alt="#acs-lang.Disable_this_locale#"></a>
@@ -63,7 +63,7 @@
       </td>
       <td align="center">
           <if @locales.default_p;literal@ true>
-            <if @locales.num_locales_for_language@ eq 1>
+            <if @locales.num_locales_for_language;literal@ eq 1>
               <span style="font-style: italic; color: gray;" title="#acs-lang.This_is_the_only_locale_for_this_language#"></span>
             </if>
             <else>