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 -r1.49 -r1.50
--- openacs-4/packages/acs-templating/tcl/parse-procs.tcl	27 Oct 2014 16:40:11 -0000	1.49
+++ openacs-4/packages/acs-templating/tcl/parse-procs.tcl	23 Jun 2015 10:52:55 -0000	1.50
@@ -532,6 +532,7 @@
 
     # substitute array variable references
     while {[regsub -all [template::adp_array_variable_regexp_noquote] $code {\1[lang::util::localize $\2(\3)]} code]} {}
+    while {[regsub -all [template::adp_array_variable_regexp_noi18n] $code {\1$[ns_quotehtml \2(\3)]} code]} {}
     while {[regsub -all [template::adp_array_variable_regexp_literal] $code {\1$\2(\3)} code]} {}
     # 
     # Some aolservers have broken implementations of ns_quotehtml
@@ -549,6 +550,7 @@
 
     # substitute simple variable references
     while {[regsub -all [template::adp_variable_regexp_noquote] $code {\1[lang::util::localize ${\2}]} code]} {}
+    while {[regsub -all [template::adp_variable_regexp_noi18n] $code {\1[ns_quotehtml ${\2}]} code]} {}
     while {[regsub -all [template::adp_variable_regexp_literal] $code {\1${\2}} code]} {}
     if {[ns_quotehtml ""] eq ""} {
         while {[regsub -all [template::adp_variable_regexp] $code {\1[ns_quotehtml [lang::util::localize ${\2}]]} code]} {}
@@ -592,6 +594,15 @@
     return {(^|[^\\])@([a-zA-Z0-9_:]+)\.([a-zA-Z0-9_:\.]+);literal@}
 }
 
+ad_proc -public template::adp_array_variable_regexp_noi18n {} {
+    adp_array_variable_regexp's pattern augmented by "literal"
+
+    @author Gustaf Neumann
+    @creation-date June 2015
+} {
+    return {(^|[^\\])@([a-zA-Z0-9_:]+)\.([a-zA-Z0-9_:\.]+);noi18n@}
+}
+
 ad_proc -public template::adp_variable_regexp {} {
     The regexp pattern used to find adp variables in
     a piece of text, i.e. occurenceis of @variable_name@. 
@@ -622,6 +633,15 @@
     return {(^|[^\\])@([a-zA-Z0-9_:]+);literal@}
 }
 
+ad_proc -public template::adp_variable_regexp_noi18n {} {
+    adp_variable_regexp augmented by "literal"
+
+    @author Gustaf Neumann
+    @creation-date June 2015
+} {
+    return {(^|[^\\])@([a-zA-Z0-9_:]+);noi18n@}
+}
+
 # Naviserver requires for disambiguation of flags and values at the
 # end of the argument processing a terminating "--" (like for other
 # commands). AOLserver does not allow the "--".