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.10 -r1.11
--- openacs-4/packages/acs-lang/www/change-locale-include.tcl	30 Sep 2003 10:09:23 -0000	1.10
+++ openacs-4/packages/acs-lang/www/change-locale-include.tcl	9 May 2004 13:48:12 -0000	1.11
@@ -29,8 +29,15 @@
 
 # Create a list of lists containing the possible locale choiches
 
-set list_of_locales [db_list_of_lists locale_loop { select label, locale from enabled_locales order by label }]
+set list_of_locales [list]
 
+db_foreach locale_loop {} {
+    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_package_locales [linsert $list_of_locales 0 [list (default) ""]]
 
 form create locale
Index: openacs-4/packages/acs-lang/www/change-locale-include.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/Attic/change-locale-include.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-lang/www/change-locale-include.xql	18 Aug 2003 10:32:53 -0000	1.1
+++ openacs-4/packages/acs-lang/www/change-locale-include.xql	9 May 2004 13:48:12 -0000	1.2
@@ -8,6 +8,14 @@
         from   timezones
     </querytext>
 </fullquery>
-	        
+
+<fullquery name="locale_loop">
+    <querytext>
+        select label,   
+               locale
+          from enabled_locales
+         order by label
+    </querytext>
+</fullquery>	        
 </queryset>