Index: openacs-4/packages/acs-templating/resources/forms/standard.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/standard.adp,v
diff -u -N -r1.27 -r1.28
--- openacs-4/packages/acs-templating/resources/forms/standard.adp	27 Oct 2014 16:40:10 -0000	1.27
+++ openacs-4/packages/acs-templating/resources/forms/standard.adp	29 Jun 2015 11:03:39 -0000	1.28
@@ -1,16 +1,16 @@
 <multiple name=elements>
 	<if @elements.section@ not nil>
-		<fieldset id="@elements.form_id@:@elements.section@" @elements.sec_fieldset;noquote@><!-- section fieldset -->
+		<fieldset id="@elements.form_id;noi18n@:@elements.section;noi18n@" @elements.sec_fieldset;noquote@><!-- section fieldset -->
         <legend @elements.sec_legend;noquote@><span>@elements.sec_legendtext@</span></legend>
 	</if>
 	
 	<group column="section">
-      <if @elements.widget@ eq "hidden"> 
-		<noparse><div><formwidget id=@elements.id@></div></noparse>
+      <if @elements.widget;literal@ eq "hidden"> 
+		<noparse><div><formwidget id="@elements.id@"></div></noparse>
 	  </if>
   
 	  <else>
-		<if @elements.widget@ eq "submit"><!-- if form submit button wrap it in the form-button class -->
+		<if @elements.widget;literal@ eq "submit"><!-- if form submit button wrap it in the form-button class -->
   		 <div class="form-button">
            <group column="widget">
              <noparse><formwidget id="@elements.id@">&nbsp;</noparse>
@@ -28,17 +28,17 @@
 			 </formerror>
 		   </noparse>
 
-		   <if @elements.widget@ in radio checkbox> 
+		   <if @elements.widget;literal@ in radio checkbox> 
              <if @elements.legendtext@ defined>
-			   <fieldset @elements.fieldset;noquote@>
+			   <fieldset @elements.fieldset;noi18n@>
                  <!-- radio button groups and checkbox groups get their own fieldsets -->
-				 <legend @elements.legend;noquote@><span>@elements.legendtext@</span></legend>
+				 <legend @elements.legend;oni18n@><span>@elements.legendtext@</span></legend>
              </if>
 		   </if>
 
              <if @elements.label@ not nil>
 			   <noparse>
-                 <if @form_properties.mode@ eq display or @elements.widget@ in radio checkbox date inform>
+                 <if @form_properties.mode;literal@ eq display or @elements.widget;literal@ in radio checkbox date inform>
                    <!-- no label tag -->
                  </if>
                  <else>
@@ -55,24 +55,24 @@
 
                @elements.label;noquote@
 
-               <if @form_properties.show_required_p@ true>
-                 <if @elements.optional@ nil and @elements.mode@ ne "display" and @elements.widget@ ne "inform">
+               <if @form_properties.show_required_p;literal@ true>
+                 <if @elements.optional@ nil and @elements.mode;literal@ ne "display" and @elements.widget;literal@ ne "inform">
                    <strong class="form-required-mark">(#acs-templating.required#)</strong>
                  </if>
                </if>
                </span><!-- form-label -->
 		     </if>
 		     <else>
-                        <if @form_properties.show_required_p@ true>
-                           <if @elements.optional@ nil and @elements.mode@ ne "display" and @elements.widget@ ne "inform">
+                        <if @form_properties.show_required_p;literal@ true>
+                           <if @elements.optional@ nil and @elements.mode;literal@ ne "display" and @elements.widget;literal@ ne "inform">
 			     <span class="form-label form-required-mark">
 			       #acs-templating.required#
 			     </span>
 		           </if>
 		        </if>
 		     </else>
 
-		     <if @elements.widget@ in radio checkbox>
+		     <if @elements.widget;literal@ in radio checkbox>
 			   <noparse>
                  <span class="form-widget">
                  <formgroup id="@elements.id@">			
@@ -90,7 +90,7 @@
                    <formwidget id="@elements.id@">
                  </span>
 			   </noparse>
-               <if @form_properties.mode@ eq display or @elements.widget@ in radio checkbox date inform><!-- no label tag --></if>
+               <if @form_properties.mode;literal@ eq display or @elements.widget;literal@ in radio checkbox date inform><!-- no label tag --></if>
                <else>
                  <if @elements.label@ not nil></label></if>
                </else>
@@ -103,7 +103,7 @@
              </span> <!-- /form-help-text -->
            </if>
 
-		   <if @elements.widget@ in radio checkbox> 
+		   <if @elements.widget;literal@ in radio checkbox> 
              <if @elements.legendtext@ defined>
                <!-- radio button groups and checkbox groups get their own fieldsets -->
 			   </fieldset>
Index: openacs-4/packages/acs-templating/tcl/parse-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/parse-procs.tcl,v
diff -u -N -r1.50 -r1.51
--- openacs-4/packages/acs-templating/tcl/parse-procs.tcl	23 Jun 2015 10:52:55 -0000	1.50
+++ openacs-4/packages/acs-templating/tcl/parse-procs.tcl	29 Jun 2015 11:03:39 -0000	1.51
@@ -518,6 +518,8 @@
     # the parse list now contains the code
     set code [join $parse_list "\n"]
 
+    #ns_log notice "CODE before i18n\n$code\n"
+
     # Substitute #foo# message keys with values from the message catalog
 
     # Since messages may read the variables of the adp page they go trough
Index: openacs-4/packages/acs-templating/tcl/tag-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/tag-init.tcl,v
diff -u -N -r1.38 -r1.39
--- openacs-4/packages/acs-templating/tcl/tag-init.tcl	12 Jun 2015 09:15:09 -0000	1.38
+++ openacs-4/packages/acs-templating/tcl/tag-init.tcl	29 Jun 2015 11:03:39 -0000	1.39
@@ -217,8 +217,8 @@
       set name "__ats_list_value"
     }
 
-    template::adp_append_code "\nset $name \[eval list $value\]\n"
-    template::adp_append_code "\nset $name:rowcount \[llength \$$name\]\n"
+    template::adp_append_code [list set $name $value]
+    template::adp_append_code "set $name:rowcount \[llength \$$name\]\n"
 
   } else {
 
@@ -231,7 +231,7 @@
 
   for { set __ats_${name}_i 0 } { \$__ats_${name}_i < \${$name:rowcount} } { incr __ats_${name}_i } {
     set $name:item \[lindex \${$name} \$__ats_${name}_i\]
-    set $name:rownum \[expr \$__ats_${name}_i + 1\]
+    set $name:rownum \[expr {\$__ats_${name}_i + 1}\]
   "
   template::adp_compile_chunk $chunk
 
@@ -410,7 +410,7 @@
   set tag_attributes [template::util::set_to_list $params id]
 
   template::adp_append_string \
-    "\[template::element render \${form:id} $id { $tag_attributes } \]"
+      "\[template::element render \${form:id} [list $id] { $tag_attributes } \]"
 }
 
 # Display the help information for an element
@@ -423,7 +423,7 @@
   set tag_attributes [template::util::set_to_list $params id]
 
   template::adp_append_string \
-    "\[template::element render_help \${form:id} $id { $tag_attributes } \]"
+      "\[template::element render_help \${form:id} [list $id] { $tag_attributes } \]"
 }
 
 # Report a form error if one is specified.
@@ -468,7 +468,7 @@
   # generate a list of options and option labels as a data source
 
   template::adp_append_code \
-    "template::element options \${form:id} $id { $tag_attributes }"
+      "template::element options \${form:id} [list $id] { $tag_attributes }"
 
   # make sure name is a parameter to pass to the rendering tag handler
   ns_set update $params name formgroup
@@ -494,13 +494,12 @@
 
     # generate a list of options and option labels as a data source
 
-
     template::adp_append_code \
-        "template::element options \${form:id} $id { $tag_attributes }"
+        "template::element options \${form:id} [list $id] { $tag_attributes }"
     
-  # make sure name is a parameter to pass to the rendering tag handler
-  ns_set update $params name formgroup
-  ns_set update $params id formgroup
+    # make sure name is a parameter to pass to the rendering tag handler
+    ns_set update $params name formgroup
+    ns_set update $params id formgroup
     template::adp_append_code "append __adp_output \"\$\{formgroup:${row}(widget)\} \$\{formgroup:${row}(label)\}\""
 
 }
@@ -512,24 +511,21 @@
 template_tag formtemplate { chunk params } {
 
   set level [template::adp_level]
-
   set id [template::get_attribute formtemplate $params id]
 
   upvar #$level $id:properties form_properties
 
-  template::adp_append_code "set form:id \"$id\""
+  template::adp_append_code [list set form:id $id]
 
   # Set optional attributes for the grid template
-  template::adp_append_code "
-    upvar 0 \"$id:properties\" form_properties"
+  template::adp_append_code \
+      [list upvar 0 $id:properties form_properties]
 
   foreach varname {headers title cols} {
 
     set form_properties($varname) [ns_set iget $params $varname]
-
-    template::adp_append_code "
-      set form_properties($varname) \"$form_properties($varname)\"
-    "
+    template::adp_append_code \
+	[list set form_properties($varname) $form_properties($varname)]
   }
 
   # get any additional HTML attributes specified by the designer
@@ -552,7 +548,7 @@
    
     # Render any hidden variables that have not been rendered yet
     template::adp_append_string \
-    "\[template::form check_elements $id\]"
+	"\[template::form check_elements $id\]"
   }
 
   if { [info exists form_properties(fieldset)] } {