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.9 -r1.10
--- openacs-4/packages/acs-lang/tcl/locale-procs.tcl	6 Dec 2002 11:13:02 -0000	1.9
+++ openacs-4/packages/acs-lang/tcl/locale-procs.tcl	13 Feb 2003 14:21:46 -0000	1.10
@@ -13,354 +13,425 @@
     @cvs-id $Id$
 }
 
-namespace eval lang::system {
+namespace eval lang::system {}
+namespace eval lang::user {}
+namespace eval lang::conn {}
 
-    ad_proc -public site_wide_locale {
-    } {
-        Get the site wide system locale setting.
-    } {
-        set package_id [apm_package_id_from_key "acs-lang"]
-        return [parameter::get -package_id $package_id -parameter SiteWideLocale]
-    }
 
-    ad_proc -public package_level_locale {
-        package_id
-    } {
-        return {}
-    }
 
-    ad_proc -public locale {
-        {-package_id ""}
-        {-site_wide:boolean}
-    } {
-        Get system locale setting for a given package instance.
-        
-        @param package_id The package for which you want to get the locale setting.
-        @param site_wide Set this if you want to get the site-wide locale setting.
-    } {
-        if { $site_wide_p } {
-            return [site_wide_locale]
-        } 
+#####
+#
+# lang::system
+#
+#####
 
-        if { [empty_string_p $package_id] } {
-            set package_id [ad_conn package_id]
-        }
+ad_proc -public lang::system::site_wide_locale {
+} {
+    Get the site wide system locale setting.
+} {
+    set package_id [apm_package_id_from_key "acs-lang"]
+    return [parameter::get -package_id $package_id -parameter SiteWideLocale]
+}
 
-        # get locale from lang_package_locale
+ad_proc -public lang::system::package_level_locale {
+    package_id
+} {
+    return {}
+}
 
-        set locale [package_level_locale $package_id]
+ad_proc -public lang::system::locale {
+    {-package_id ""}
+    {-site_wide:boolean}
+} {
+    Get system locale setting for a given package instance.
+    
+    @param package_id The package for which you want to get the locale setting.
+    @param site_wide Set this if you want to get the site-wide locale setting.
+} {
+    if { $site_wide_p } {
+        return [site_wide_locale]
+    } 
 
-        # If there's no package setting, use the site-wide setting
-        if { [empty_string_p $locale] } {
-            set locale [locale -site_wide]
-        } 
-        return $locale
+    if { [empty_string_p $package_id] } {
+        set package_id [ad_conn package_id]
     }
 
-    ad_proc -public set_locale {
-        {-package_id ""}
-        {-site_wide:boolean}
-        locale
-    } {
-        Set system locale setting for a given package instance, or the
-        site-wide system locale.
-        
-        @param package_id The package for which you want to set the locale setting.
-        @param site_wide Set this if you want to set the site-wide locale setting.
-        @param locale The new locale that you want to use as your system locale.
-    } {
-        if { $site_wide_p } {
-            set package_id [apm_package_id_from_key "acs-lang"]
-            parameter::set_value -package_id $package_id -parameter SiteWideLocale -value $locale
-        } else {
-            if { [empty_string_p $package_id] } {
-                set package_id [ad_conn package_id]
-            }
-            # Pssst! We don't actually use this package thing, 
-            # but we'll probably do so later.
-            set_locale -site_wide $locale
+    # get locale from lang_package_locale
+
+    set locale [package_level_locale $package_id]
+
+    # If there's no package setting, use the site-wide setting
+    if { [empty_string_p $locale] } {
+        set locale [locale -site_wide]
+    } 
+    return $locale
+}
+
+ad_proc -public lang::system::set_locale {
+    {-package_id ""}
+    {-site_wide:boolean}
+    locale
+} {
+    Set system locale setting for a given package instance, or the
+    site-wide system locale.
+    
+    @param package_id The package for which you want to set the locale setting.
+    @param site_wide Set this if you want to set the site-wide locale setting.
+    @param locale The new locale that you want to use as your system locale.
+} {
+    if { $site_wide_p } {
+        set package_id [apm_package_id_from_key "acs-lang"]
+        parameter::set_value -package_id $package_id -parameter SiteWideLocale -value $locale
+    } else {
+        if { [empty_string_p $package_id] } {
+            set package_id [ad_conn package_id]
         }
+        # Pssst! We don't actually use this package thing, 
+        # but we'll probably do so later.
+        set_locale -site_wide $locale
     }
+}
 
-    ad_proc -public language {
-        {-package_id ""}
-        {-site_wide:boolean}
-    } {
-        Get system language setting for a given package instance.
-        
-        @param package_id The package for which you want to get the language setting.
-        @param site_wide Set this if you want to get the site-wide language setting.
-    } {
-        return [string range [locale -package_id $package_id -site_wide=$site_wide_p] 0 1]
+ad_proc -public lang::system::language {
+    {-package_id ""}
+    {-site_wide:boolean}
+} {
+    Get system language setting for a given package instance.
+    
+    @param package_id The package for which you want to get the language setting.
+    @param site_wide Set this if you want to get the site-wide language setting.
+} {
+    return [string range [locale -package_id $package_id -site_wide=$site_wide_p] 0 1]
+}
+
+ad_proc -public lang::system::timezone {} {
+    Ask OpenACS what it thinks our timezone is.
+    
+    @return  a timezone name from acs-reference package (e.g., Asia/Tokyo, America/New_York)
+} {
+    if { ![lang::system::timezone_support_p] } {
+        return ""
     }
 
-    ad_proc -public timezone {} {
-        Ask OpenACS what it thinks our timezone is.
-        
-        @return  a timezone name from acs-reference package (e.g., Asia/Tokyo, America/New_York)
-    } {
-        set package_id [apm_package_id_from_key "acs-lang"]
-        return [parameter::get -package_id $package_id -parameter SystemTimezone -default "Etc/UTC"]
+    set package_id [apm_package_id_from_key "acs-lang"]
+    return [parameter::get -package_id $package_id -parameter SystemTimezone -default "Etc/UTC"]
+}
+
+ad_proc -private lang::system::timezone_support_p {} {
+    Return 1 if this installation of acs-lang offers 
+    timezone services and 0 otherwise.
+
+    For the acs-lang package to offer timezone support the
+    ref-timezones and acs-reference packages need to be installed.
+    Those packages are currently not part of the OpenACS kernel.
+} {
+    return [apm_package_installed_p ref-timezones]
+}
+    
+ad_proc -public lang::system::set_timezone { 
+    timezone
+}  { 
+    Tell OpenACS what timezone we think it's running in.
+    
+    @param timezone name from acs-reference package (e.g., Asia/Tokyo, America/New_York)
+} {
+    if { ![lang::system::timezone_support_p] } {
+        return ""
     }
-        
-    ad_proc -public set_timezone { 
-        timezone
-    }  { 
-        Tell OpenACS what timezone we think it's running in.
-        
-        @param timezone name from acs-reference package (e.g., Asia/Tokyo, America/New_York)
-    } {
-        set package_id [apm_package_id_from_key "acs-lang"]
-        parameter::set_value -package_id $package_id -parameter SystemTimezone -value $timezone
-    }
 
-    ad_proc -public timezone_utc_offset { } {
-        @return number of hours to subtract from local (database) time to get UTC
-    } {
-        set system_timezone [timezone]
-        return [db_string system_utc_offset {}]
+    set package_id [apm_package_id_from_key "acs-lang"]
+    parameter::set_value -package_id $package_id -parameter SystemTimezone -value $timezone
+}
+
+ad_proc -public lang::system::timezone_utc_offset { } {
+    @return number of hours to subtract from local (database) time to get UTC
+} {
+    if { ![lang::system::timezone_support_p] } {
+        return ""
     }
 
+    set system_timezone [timezone]
+    return [db_string system_utc_offset {}]
 }
 
-namespace eval lang::user {
 
-    ad_proc -public package_level_locale {
-        package_id
-    } {
-        Get the user's preferred package level locale for a package
-        given by its package id.
 
-    } {
-        set user_id [ad_conn user_id]
-        if { [string equal $user_id 0] } {
+#####
+#
+# lang::user
+#
+#####
 
-            # if the user is not logged in then use a session
-            # variable - right now this is only for acs-lang - aka the
-            # site wide locale
+ad_proc -public lang::user::package_level_locale_not_cached {
+    user_id
+    package_id
+} {
+    Get the user's preferred package level locale for a package
+    given by its package id. Will return the empty string if the
+    user has not preference for the package.
+} {
+    if { [string equal $user_id 0] } {
 
-            if { [string equal $package_id [apm_package_id_from_key "acs-lang"] ] } {
-                return [ad_get_client_property -cache t "acs-lang" "user_locale"]
-            }
-            return ""
+        # if the user is not logged in then use a session
+        # variable - right now this is only for acs-lang - aka the
+        # site wide locale
+
+        if { [string equal $package_id [apm_package_id_from_key "acs-lang"] ] } {
+            return [ad_get_client_property -cache t "acs-lang" "user_locale"]
         }
-        set locale [db_string get_user_locale {} -default ""]
-        return $locale
+        return {}
     }
+
+    set locale [db_string get_user_locale {} -default ""]
+
+    return $locale
+}
     
-    ad_proc -public site_wide_locale {
-    } {
-        Get the user's preferred site wide locale.
-    } {
-        return [package_level_locale [apm_package_id_from_key "acs-lang"]]
-    }
+ad_proc -public lang::user::package_level_locale {
+    package_id
+} {
+    Get the user's preferred package level locale for a package
+    given by its package id.
+} {
+    set user_id [ad_conn user_id]
+    # Cache for the lifetime of sessions (7 days)
+    return [util_memoize [list lang::user::package_level_locale_not_cached $user_id $package_id] [sec_session_timeout]]
+}
 
-    ad_proc -public locale {
-        {-package_id ""}
-        {-site_wide:boolean}
-    } {
-        Get user locale preference for a given package instance.
-        This preliminary implementation only has one site-wide setting, though.
-        
-        @param package_id The package for which you want to get the locale preference.
-        @param site_wide Set this if you want to get the site-wide locale preference.
-    } {
-        # default value for package_id
+ad_proc -public lang::user::site_wide_locale {
+} {
+    Get the user's preferred site wide locale.
+} {
+    return [package_level_locale [apm_package_id_from_key "acs-lang"]]
+}
 
-        if { [empty_string_p $package_id] } {
-            set package_id [ad_conn package_id]
-        }
+ad_proc -public lang::user::locale {
+    {-package_id ""}
+    {-site_wide:boolean}
+} {
+    Get user locale preference for a given package instance.
+    This preliminary implementation only has one site-wide setting, though.
+    
+    @param package_id The package for which you want to get the locale preference.
+    @param site_wide Set this if you want to get the site-wide locale preference.
+} {
+    # default value for package_id
 
-        # get package level locale
+    if { [empty_string_p $package_id] } {
+        set package_id [ad_conn package_id]
+    }
 
-        set locale [package_level_locale $package_id]
+    # get package level locale
 
-        # If there's no package setting, then use the site-wide setting
+    set locale [package_level_locale $package_id]
 
-        if { [empty_string_p $locale] } {
-            set locale [site_wide_locale]
-        } 
-        return $locale
-    }
+    # If there's no package setting, then use the site-wide setting
 
-    ad_proc -public set_locale {
-        {-package_id ""}
-        {-site_wide:boolean}
-        locale
-    } {
-        Set system locale setting for a given package instance. 
-        This preliminary implementation only has one site-wide setting, though.
-        
-        @param package_id The package for which you want to set the locale setting.
-        @param site_wide Set this if you want to set the site-wide locale setting.
-        @param locale The new locale that you want to use as your system locale.
-    } {
-        set user_id [ad_conn user_id]
-        if { $user_id == 0 } {
-            # Not logged in, use a session-based client property
-            ad_set_client_property -persistent t "acs-lang" "user_locale" $locale
-            return
-        }
+    if { [empty_string_p $locale] } {
+        set locale [site_wide_locale]
+    } 
+    return $locale
+}
+
+ad_proc -public lang::user::set_locale {
+    {-package_id ""}
+    {-site_wide:boolean}
+    locale
+} {
+    Set system locale setting for a given package instance. 
+    This preliminary implementation only has one site-wide setting, though.
     
-        if { $site_wide_p } {
-            set package_id [apm_package_id_from_key "acs-lang"]
-        } elseif { [empty_string_p $package_id] } {
-            set package_id [ad_conn package_id]
-        }        
+    @param package_id The package for which you want to set the locale setting.
+    @param site_wide Set this if you want to set the site-wide locale setting.
+    @param locale The new locale that you want to use as your system locale.
+} {
+    set user_id [ad_conn user_id]
+    if { $user_id == 0 } {
+        # Not logged in, use a session-based client property
+        ad_set_client_property -persistent t "acs-lang" "user_locale" $locale
+        return
+    }
 
-        set user_locale_exists_p [db_string user_locale_exists_p {}]
-        if { $user_locale_exists_p } {
-            if { ![empty_string_p $locale] } {
-                db_dml update_user_locale {}
-            } else {
-                db_dml delete_user_locale {}
-            }
+    if { $site_wide_p } {
+        set package_id [apm_package_id_from_key "acs-lang"]
+    } elseif { [empty_string_p $package_id] } {
+        set package_id [ad_conn package_id]
+    }        
+
+    # Flush the user locale preference cache
+    util_memoize_flush [list lang::user::package_level_locale_not_cached $user_id $package_id]
+  
+    set user_locale_exists_p [db_string user_locale_exists_p {}]
+    if { $user_locale_exists_p } {
+        if { ![empty_string_p $locale] } {
+            db_dml update_user_locale {}
         } else {
-            if { ![empty_string_p $locale] } {
-                db_dml insert_user_locale {}
-            }
+            db_dml delete_user_locale {}
         }
+    } else {
+        if { ![empty_string_p $locale] } {
+            db_dml insert_user_locale {}
+        }
     }
+}
 
-    ad_proc -public language {
-        {-package_id ""}
-        {-site_wide:boolean}
-    } {
-        Get user language preference for a given package instance.
-        This preliminary implementation only has one site-wide setting, though.
-        
-        @param package_id The package for which you want to get the language setting.
-        @param site_wide Set this if you want to get the site-wide language setting.
-    } {
-        return [string range [locale -package_id $package_id -site_wide=$site_wide_p] 0 1]
+ad_proc -public lang::user::language {
+    {-package_id ""}
+    {-site_wide:boolean}
+} {
+    Get user language preference for a given package instance.
+    This preliminary implementation only has one site-wide setting, though.
+    
+    @param package_id The package for which you want to get the language setting.
+    @param site_wide Set this if you want to get the site-wide language setting.
+} {
+    return [string range [locale -package_id $package_id -site_wide=$site_wide_p] 0 1]
+}
+
+ad_proc -public lang::user::timezone {} {
+    Get the user's timezone. Returns the empty string if the user
+    has no timezone set.
+    
+    @return  a timezone name from acs-reference package (e.g., Asia/Tokyo, America/New_York)
+} {
+    if { ![lang::system::timezone_support_p] } {
+        return ""
     }
 
-    ad_proc -public timezone {} {
-        Get the user's timezone. Returns the empty string if the user
-        has no timezone set.
-        
-        @return  a timezone name from acs-reference package (e.g., Asia/Tokyo, America/New_York)
-    } {
-        # FIXME:
-        # We probably don't want to keep this in client properties, since these are
-        # no longer permanent. We'll move this into a DB table at some point.
-        return [ad_get_client_property -cache t "acs-lang" "timezone"]
+    # FIXME:
+    # We probably don't want to keep this in client properties, since these are
+    # no longer permanent. We'll move this into a DB table at some point.
+    return [ad_get_client_property -cache t "acs-lang" "timezone"]
+}
+    
+ad_proc -public lang::user::set_timezone { 
+    timezone
+}  { 
+    Set the user's timezone setting.
+    
+    @param timezone name from acs-reference package (e.g., Asia/Tokyo, America/New_York)
+} {
+    if { ![lang::system::timezone_support_p] } {
+        return ""
     }
-        
-    ad_proc -public set_timezone { 
-        timezone
-    }  { 
-        Set the user's timezone setting.
-        
-        @param timezone name from acs-reference package (e.g., Asia/Tokyo, America/New_York)
-    } {
-        # FIXME: (lars)
-        # This shouldn't be in client properties, since they're session-based
-        # I'm doing this for now, because I don't know whether we'll use a separate table, 
-        # like with the locale setting, or the user-profile package.
-        ad_set_client_property -persistent t "acs-lang" timezone $timezone
-    }
 
+    # FIXME: (lars)
+    # This shouldn't be in client properties, since they're session-based
+    # I'm doing this for now, because I don't know whether we'll use a separate table, 
+    # like with the locale setting, or the user-profile package.
+    ad_set_client_property -persistent t "acs-lang" timezone $timezone
 }
 
-namespace eval lang::conn {
 
-    ad_proc -public locale {
-        {-package_id ""}
-        {-site_wide:boolean}
-    } {
-        Get the locale for this request, perhaps for a given package instance.
-        This procedure will never return an error. Everything that could fail is 
-        wrapped in a catch.
-        
-        @param package_id The package for which you want to get the locale.
-        @param site_wide Set this if you want to get the site-wide locale.
-    } {
-        if { $site_wide_p } { 
-            set locale [lang::user::site_wide_locale]
-            if { [empty_string_p $locale] } {
-                set locale [lang::system::site_wide_locale]
-            }
-            return $locale
-        }
 
-        # default value for package_id
 
-        if { [empty_string_p $package_id] } {
-            set package_id [ad_conn package_id]
+
+#####
+#
+# lang::conn
+#
+#####
+
+ad_proc -public lang::conn::locale {
+    {-package_id ""}
+    {-site_wide:boolean}
+} {
+    Get the locale for this request, perhaps for a given package instance.
+    This procedure will never return an error. Everything that could fail is 
+    wrapped in a catch.
+    
+    @param package_id The package for which you want to get the locale.
+    @param site_wide Set this if you want to get the site-wide locale.
+} {
+    if { $site_wide_p } { 
+        set locale [lang::user::site_wide_locale]
+        if { [empty_string_p $locale] } {
+            set locale [lang::system::site_wide_locale]
         }
+        return $locale
+    }
 
-        # use user's package level locale
+    # default value for package_id
 
-        set locale [lang::user::package_level_locale $package_id]
+    if { [empty_string_p $package_id] } {
+        set package_id [ad_conn package_id]
+    }
 
-        # if that does not exist use system's package level locale
+    # use user's package level locale
 
-        if { [empty_string_p $locale] } {
-            set locale [lang::system::package_level_locale $package_id]
-        } 
+    set locale [lang::user::package_level_locale $package_id]
 
-        # if that does not exist use user's site wide locale
+    # if that does not exist use system's package level locale
 
-        if { [empty_string_p $locale] } {
-            set locale [lang::user::site_wide_locale]
-        } 
+    if { [empty_string_p $locale] } {
+        set locale [lang::system::package_level_locale $package_id]
+    } 
 
-        # if that does not exist use system's site wide locale
+    # if that does not exist use user's site wide locale
 
-        if { [empty_string_p $locale] } {
-            set locale [lang::system::site_wide_locale]
-        } 
+    if { [empty_string_p $locale] } {
+        set locale [lang::user::site_wide_locale]
+    } 
 
-        # if that does not exist then we are back to just another language
-        # let's pick uhmm... en_US
+    # if that does not exist use system's site wide locale
 
-        if { [empty_string_p $locale] } {
-            set locale en_US
-        } 
+    if { [empty_string_p $locale] } {
+        set locale [lang::system::site_wide_locale]
+    } 
 
-        return $locale
-    }
+    # if that does not exist then we are back to just another language
+    # let's pick uhmm... en_US
 
-    ad_proc -public language {
-        {-package_id ""}
-        {-site_wide:boolean}
-    } {
-        Get the language for this request, perhaps for a given package instance.
-        
-        @param package_id The package for which you want to get the language.
-        @param site_wide Set this if you want to get the site-wide language.
-    } {
-        return [string range [locale -package_id $package_id -site_wide=$site_wide_p] 0 1]
-    }
+    if { [empty_string_p $locale] } {
+        set locale en_US
+    } 
 
-    ad_proc -public charset { 
-    } {
-        Returns the MIME charset name corresponding to the current connection's locale.
+    return $locale
+}
+
+ad_proc -public lang::conn::language {
+    {-package_id ""}
+    {-site_wide:boolean}
+} {
+    Get the language for this request, perhaps for a given package instance.
     
-        @author        Lars Pind (lars@pinds.com)
-        @param locale  Name of a locale, as language_COUNTRY using ISO 639 and ISO 3166
-        @return        IANA MIME character set name
-    } {
-        return [lang::util::charset_for_locale [lang::conn::locale]]
+    @param package_id The package for which you want to get the language.
+    @param site_wide Set this if you want to get the site-wide language.
+} {
+    return [string range [locale -package_id $package_id -site_wide=$site_wide_p] 0 1]
+}
+
+ad_proc -public lang::conn::charset { 
+} {
+    Returns the MIME charset name corresponding to the current connection's locale.
+
+    @author        Lars Pind (lars@pinds.com)
+    @param locale  Name of a locale, as language_COUNTRY using ISO 639 and ISO 3166
+    @return        IANA MIME character set name
+} {
+    return [lang::util::charset_for_locale [lang::conn::locale]]
+}
+
+ad_proc -public lang::conn::timezone {} {
+    Get this connection's timezone. This is the user timezone, if
+    set, otherwise the system timezone.
+    
+    @return  a timezone name from acs-reference package (e.g., Asia/Tokyo, America/New_York)
+} {
+    if { ![lang::system::timezone_support_p] } {
+        return ""
     }
 
-    ad_proc -public timezone {} {
-        Get this connection's timezone. This is the user timezone, if
-        set, otherwise the system timezone.
-        
-        @return  a timezone name from acs-reference package (e.g., Asia/Tokyo, America/New_York)
-    } {
-        set timezone [lang::user::timezone]
-        if { [empty_string_p $timezone] } {
-            # No user timezone, return the system timezone
-            set timezone [lang::system::timezone]
-        }
-        return $timezone
+    set timezone [lang::user::timezone]
+    if { [empty_string_p $timezone] } {
+        # No user timezone, return the system timezone
+        set timezone [lang::system::timezone]
     }
+    return $timezone
 }
 
 
+
 #####
 #
 # Backwards compatibility procs
Index: openacs-4/packages/acs-lang/tcl/locale-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/locale-procs.xql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-lang/tcl/locale-procs.xql	3 Dec 2002 17:26:54 -0000	1.4
+++ openacs-4/packages/acs-lang/tcl/locale-procs.xql	13 Feb 2003 14:21:46 -0000	1.5
@@ -1,16 +1,15 @@
 <?xml version="1.0"?>
 <queryset>
 
-   <fullquery name="lang::user::package_level_locale.get_user_locale">      
+    <fullquery name="lang::user::package_level_locale_not_cached.get_user_locale">      
       <querytext>
         select locale
         from   ad_locale_user_prefs
         where  user_id = :user_id
-        and    package_id = :package_id
+          and  package_id = :package_id
       </querytext>
    </fullquery>
 
-
    <fullquery name="lang::user::set_locale.user_locale_exists_p">
       <querytext>
         select count(*)