Index: openacs-4/packages/acs-lang/www/admin/locale-new.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/locale-new.xql,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/acs-lang/www/admin/locale-new.xql	8 Jan 2010 17:39:58 -0000	1.1
+++ openacs-4/packages/acs-lang/www/admin/locale-new.xql	14 May 2010 13:15:46 -0000	1.1.2.1
@@ -4,16 +4,16 @@
 
   <fullquery name="select_countries">
     <querytext>
-      select label, country 
-      from country_codes 
-      order by label
+      select default_name, iso
+      from countries 
+      order by default_name
     </querytext>
   </fullquery>
 
   <fullquery name="select_languages">
     <querytext>
       select label, coalesce(iso_639_1, iso_639_2) 
-      from language_codes 
+      from language_639_2_codes 
       order by label
     </querytext>
   </fullquery>