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 -r1.11 -r1.12
--- openacs-4/packages/acs-templating/tcl/tag-init.tcl	28 Aug 2003 09:41:45 -0000	1.11
+++ openacs-4/packages/acs-templating/tcl/tag-init.tcl	3 Sep 2003 19:53:04 -0000	1.12
@@ -611,15 +611,17 @@
   # (the ad_conn call is dumped into the code, not executed on the spot)
 
   if { ![info exists locale] } {
-        set locale "\[ad_conn locale\]"
+      # We need this to be executed at template execution time, because the template's
+      # compiled code will be cached and reused for many requests.
+      set locale "\[ad_conn locale\]"
   } else {
       # Check to see if we should register this into the message catalog
       if { [string length $locale] == 2 } {
-          set locale [util_memoize [list ad_locale_locale_from_lang $locale]]
+          set locale [lang::util::default_locale_from_lang $locale]
       }
 
       # Check the cache
-      if { ![nsv_exists lang_message_$locale $key] } { 
+      if { ![lang::message::message_exists_p $locale $key] } {
           lang::message::register $locale $key $chunk
       }
   }