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.16 -r1.51.2.17 --- openacs-4/packages/acs-lang/tcl/locale-procs.tcl 8 Feb 2023 15:25:31 -0000 1.51.2.16 +++ openacs-4/packages/acs-lang/tcl/locale-procs.tcl 10 Feb 2023 15:48:15 -0000 1.51.2.17 @@ -308,18 +308,18 @@ ad_unset_cookie $cookie_name } } - # - # When no locale cookie is set, or the locale is invalid, fall - # back to system locale. - # - if { $locale eq "" } { - set locale $system_locale - } - } else { - set locale [db_string get_user_site_wide_locale {} -default "$system_locale"] + set locale [db_string get_user_site_wide_locale {} -default ""] } + # + # When no locale cookie is set, or the locale is invalid or empty, + # fall back to system locale. + # + if { $locale eq "" } { + set locale $system_locale + } + return $locale }