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 -r1.51.2.12 -r1.51.2.13
--- openacs-4/packages/acs-lang/tcl/locale-procs.tcl	28 Feb 2022 17:41:09 -0000	1.51.2.12
+++ openacs-4/packages/acs-lang/tcl/locale-procs.tcl	26 Jun 2022 19:38:47 -0000	1.51.2.13
@@ -316,7 +316,8 @@
     set system_locale [lang::system::site_wide_locale]
 
     if { $user_id == 0 } {
-        set locale [ad_get_cookie "ad_locale"]
+        set cookie_name [security::cookie_name locale]
+        set locale [ad_get_cookie $cookie_name]
         if {$locale ne ""} {
             #
             # Check, if someone hacked the cookie
@@ -327,7 +328,7 @@
                 #
                 # The cookie was invalid, so get rid of it.
                 #
-                ad_unset_cookie "ad_locale"
+                ad_unset_cookie $cookie_name
             }
         }
         #
@@ -402,7 +403,8 @@
 
     if { $user_id == 0 } {
         # Not logged in, use a cookie-based client locale
-        ad_set_cookie -replace t -max_age inf "ad_locale" $locale
+        set cookie_name [security::cookie_name locale]
+        ad_set_cookie -replace t -max_age inf -samesite strict $cookie_name $locale
 
         # Flush the site-wide user preference cache
         util_memoize_flush [list lang::user::site_wide_locale_not_cached $user_id]