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 -r1.51.2.1
--- openacs-4/packages/acs-lang/tcl/locale-procs.tcl	6 Nov 2018 10:41:15 -0000	1.51
+++ openacs-4/packages/acs-lang/tcl/locale-procs.tcl	19 Jun 2019 18:10:40 -0000	1.51.2.1
@@ -1,4 +1,3 @@
-#/packages/lang/tcl/ad-locale.tcl
 ad_library {
 
     Localization procedures for OpenACS
@@ -366,12 +365,21 @@
         set package_id [ad_conn package_id]
     }
 
-    # Try package level locale first
-    set locale [package_level_locale -user_id $user_id $package_id]
-
-    # If there's no package setting, then use the site-wide setting
-    if { $locale eq "" } {
+    if {$site_wide_p} {
         set locale [site_wide_locale -user_id $user_id]
+    } else {
+        #
+        # Try package level locale first unless site_wide_p was
+        # specified.
+        #
+        set locale [package_level_locale -user_id $user_id $package_id]
+        #
+        # If there's no package setting, then use the site-wide
+        # setting.
+        #
+        if { $locale eq "" } {
+            set locale [site_wide_locale -user_id $user_id]
+        }
     }
 
     return $locale