Index: openacs-4/packages/acs-lang/tcl/lang-widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-widget-procs.tcl,v
diff -u -r1.2.2.4 -r1.2.2.5
--- openacs-4/packages/acs-lang/tcl/lang-widget-procs.tcl	13 Feb 2007 09:40:30 -0000	1.2.2.4
+++ openacs-4/packages/acs-lang/tcl/lang-widget-procs.tcl	13 Jul 2007 09:31:35 -0000	1.2.2.5
@@ -27,7 +27,9 @@
     if { [info exists element(html)] } {
         array set attributes $element(html)
     }
-
+    if { [info exists element(values)] } {
+         template::util::list_to_lookup $element(values) values
+    }
     array set attributes $tag_attributes
 
     append output "<select name=\"$element(name)\" id=\"$element(name)\" "
Index: openacs-4/packages/acs-lang/www/change-locale-include.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/change-locale-include.tcl,v
diff -u -r1.13.6.1 -r1.13.6.2
--- openacs-4/packages/acs-lang/www/change-locale-include.tcl	3 Nov 2006 20:47:40 -0000	1.13.6.1
+++ openacs-4/packages/acs-lang/www/change-locale-include.tcl	13 Jul 2007 09:31:35 -0000	1.13.6.2
@@ -65,7 +65,8 @@
     -widget select_locales \
     -optional \
     -label "[_ acs-lang.Your_Preferred_Locale]" \
-    -options $list_of_locales
+    -options $list_of_locales \
+    -values [ad_conn locale]
 
 if { $package_level_locales_p } {
     set package_name [apm_instance_name_from_id $package_id]