Index: openacs-4/packages/acs-lang/tcl/locale-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/locale-procs.tcl,v
diff -u -N -r1.51.2.5 -r1.51.2.6
--- openacs-4/packages/acs-lang/tcl/locale-procs.tcl	20 Jan 2020 10:44:35 -0000	1.51.2.5
+++ openacs-4/packages/acs-lang/tcl/locale-procs.tcl	18 May 2020 21:13:20 -0000	1.51.2.6
@@ -205,12 +205,13 @@
 
     @author Peter Marklund
 } {
-    #set key ::__per_request(lang::system::get_locales_not_cached)
-    set key ::lang::system_get_locales_not_cached
-    if {![info exists $key]} {
-        set $key [util_memoize lang::system::get_locales_not_cached]
-    }
-    return [set $key]
+    return [acs::per_thread_cache eval -key acs-lang:system_get_locales {
+        db_list select_system_locales {
+            select locale
+            from   ad_locales
+            where  enabled_p = 't'
+        }
+    }]
 }
 
 ad_proc -public lang::system::get_locale_options {} {
@@ -234,24 +235,13 @@
     db_dml set_enabled_p { update ad_locales set enabled_p = :enabled_p where locale = :locale }
 
     # Flush caches
-    unset -nocomplain ::lang::system_get_locales_not_cached
+    unset -nocomplain ::acs::cache::acs-lang:system_get_locales
     util_memoize_flush_regexp {^lang::util::default_locale_from_lang_not_cached}
     util_memoize_flush_regexp {^lang::system::get_locales}
     util_memoize_flush_regexp {^lang::system::get_locale_options}
 }
 
-ad_proc -private lang::system::get_locales_not_cached {} {
-    Return all enabled locales in the system.
 
-    @author Peter Marklund
-} {
-    return [db_list select_system_locales {
-        select locale
-        from   ad_locales
-        where  enabled_p = 't'
-    }]
-}
-
 ad_proc -private lang::system::get_locale_options_not_cached {} {
     Return all enabled locales in the system in a format suitable for the options argument of a form.