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.45 -r1.46
--- openacs-4/packages/acs-templating/tcl/parse-procs.tcl	9 Jan 2010 01:56:09 -0000	1.45
+++ openacs-4/packages/acs-templating/tcl/parse-procs.tcl	18 Nov 2012 18:47:20 -0000	1.46
@@ -508,7 +508,7 @@
 } {
   variable parse_list
   # initialize the compiled code
-  set parse_list [list "set __adp_output \"\""]
+  set parse_list [list "set __adp_output {}; set __ad_conn_locale \[ad_conn locale\]"]
 
   switch -exact -- $source_type {
     -file { set chunk [template::util::read_file $source] }
@@ -542,7 +542,7 @@
 
   # Since messages may read the variables of the adp page they go trough
   # expand_percentage_signs which amongst other things does an uplevel subst
-  while {[regsub -all {([^\\])\#([-a-zA-Z0-9_:\.]+)\#} $code {\1[template::expand_percentage_signs [lang::message::lookup [ad_conn locale] {\2} {TRANSLATION MISSING} {} -1]]} code]} {}
+  while {[regsub -all {([^\\])\#([-a-zA-Z0-9_:\.]+)\#} $code {\1[template::expand_percentage_signs [lang::message::lookup $__ad_conn_locale {\2} {TRANSLATION MISSING} {} -1]]} code]} {}
 
   # We do each substitution set in two pieces, separately for normal
   # variables and for variables with ";noquote" attached to them.