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 -N -r1.18 -r1.19
--- openacs-4/packages/acs-lang/www/change-locale-include.tcl	7 Aug 2017 23:47:57 -0000	1.18
+++ openacs-4/packages/acs-lang/www/change-locale-include.tcl	8 Mar 2018 08:44:19 -0000	1.19
@@ -38,13 +38,16 @@
 
 set list_of_locales [list]
 
-db_foreach locale_loop {} {
+db_foreach locale_loop {
+    select label, locale from enabled_locales
+} {
     if { [lang::message::message_exists_p $locale acs-lang.this-language] } {
         set label "[lang::message::lookup $locale  acs-lang.this-language]"
     }
     lappend list_of_locales [list ${label} $locale]
 }
 
+set list_of_locales [lsort -dictionary -index 0 $list_of_locales]
 set list_of_package_locales [linsert $list_of_locales 0 [list (default) ""]]
 
 form create locale
@@ -95,10 +98,11 @@
 }
 
 if { $use_timezone_p } {
-    set timezone_options [db_list_of_lists all_timezones {}]
-
+    set timezone_options [db_list_of_lists all_timezones {
+        select tz || ' ' || gmt_offset as tz, tz from timezones
+    }]
     element create locale timezone -datatype text -widget select -optional \
-        -label "[_ acs-lang.Your_timezone]" \
+        -label [_ acs-lang.Your_timezone] \
         -options $timezone_options
 }