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.44 -r1.45
--- openacs-4/packages/acs-lang/tcl/locale-procs.tcl	9 May 2018 15:33:28 -0000	1.44
+++ openacs-4/packages/acs-lang/tcl/locale-procs.tcl	28 Jun 2018 08:07:54 -0000	1.45
@@ -199,11 +199,18 @@
 }
 
 ad_proc -public lang::system::get_locales {} {
-    Return all enabled locales in the system. Cached
+    
+    Return all enabled locales in the system. This value is cached per
+    thread and needs currently a server restart, when the system
+    locales are changed.
 
     @author Peter Marklund
 } {
-    return [util_memoize lang::system::get_locales_not_cached]
+    set key ::__per_request(lang::system::get_locales_not_cached)
+    if {![info exists $key]} {
+        set $key [util_memoize lang::system::get_locales_not_cached]
+    }
+    return [set $key]
 }
 
 ad_proc -public lang::system::get_locale_options {} {