Index: openacs-4/packages/acs-lang/tcl/lang-util-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-util-procs.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-lang/tcl/lang-util-procs.xql	18 Aug 2003 08:04:26 -0000	1.2
+++ openacs-4/packages/acs-lang/tcl/lang-util-procs.xql	21 Aug 2003 08:45:26 -0000	1.3
@@ -13,12 +13,15 @@
 
    <fullquery name="lang::util::default_locale_from_lang_not_cached.default_locale_from_lang">
       <querytext>
-      
-        select locale 
-        from   ad_locales 
+        select locale
+        from   ad_locales
         where  language = '[db_quote $language]'
-        and    default_p = 't'
-    
+        and    enabled_p = 't'
+        and    (default_p = 't' or
+                (select count(*)
+                from ad_locales
+                where language = '[db_quote $language]') = 1
+                    )
       </querytext>
    </fullquery>