Index: openacs-4/packages/categories/www/cadmin/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/master.adp,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/categories/www/cadmin/master.adp	2 Feb 2008 13:50:17 -0000	1.4
+++ openacs-4/packages/categories/www/cadmin/master.adp	16 Apr 2008 22:19:50 -0000	1.4.2.1
@@ -5,7 +5,15 @@
 
 <if @change_locale@ eq t and @languages@ not nil>
   <div style="float: right;">
-    <formtemplate id="locale_form"></formtemplate>
+    <formtemplate id="locale_form">
+      @form_vars;noquote@
+      <table cellspacing="2" cellpadding="2" border="0">
+        <tr class="form-element"><td class="form-label">Language</td>
+        <td class="form-widget"><formwidget id="locale"></td></tr>
+        <tr class="form-element">
+        <td align="right" colspan="2"><formwidget id="formbutton:ok"></td></tr>
+      </table>
+    </formtemplate>
   </div>
 </if>
 
Index: openacs-4/packages/categories/www/cadmin/master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/master.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/categories/www/cadmin/master.tcl	2 Feb 2008 13:50:17 -0000	1.6
+++ openacs-4/packages/categories/www/cadmin/master.tcl	16 Apr 2008 22:19:50 -0000	1.6.2.1
@@ -13,20 +13,8 @@
 
 set languages [lang::system::get_locale_options]
 
-set vars_to_export_list {tree_id category_id}
-
-set set_id [ad_conn form]
-set varname_list [ad_ns_set_keys -exclude {locale form:mode form:id __confirmed_p __refreshing_p formbutton:ok} $set_id]
-
-foreach name $varname_list {
-    set $name [ns_set get $set_id $name]
-    lappend vars_to_export_list $name
+ad_form -name locale_form -action [ad_conn url] -export { tree_id category_id } -form {
+    {locale:text(select) {label "Language"} {value $locale} {options $languages}}
 }
 
-ad_form -name locale_form -action [ad_conn url] -export $vars_to_export_list -html {class "inline-form"} -form {
-    {locale:text(select),optional 
-        {label "Language"} 
-        {value $locale} 
-        {options $languages}
-    }
-}
+set form_vars [export_ns_set_vars form {locale form:mode form:id __confirmed_p __refreshing_p formbutton:ok} [ad_conn form]]