Index: openacs-4/packages/acs-admin/www/apm/version-i18n-export.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n-export.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/apm/version-i18n-export.adp	3 Oct 2003 08:56:40 -0000	1.3
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-export.adp	22 Oct 2003 11:39:21 -0000	1.4
@@ -2,10 +2,14 @@
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
-<p> Export successful. </p>
+<p>
+  Export complete.
+</p>
 
-<p> Catalog files are stored in the directory <b>@catalog_dir@</b>. </p>
+<p>
+  Catalog files are stored in the directory <b>@catalog_dir@</b>.
+</p>
 
 <p>
-<b>&raquo;</b> <a href="@return_url@">Return to internationalization management</a>
+  <b>&raquo;</b> <a href="@return_url@">Return</a>
 </p>
Index: openacs-4/packages/acs-admin/www/apm/version-i18n-export.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n-export.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-admin/www/apm/version-i18n-export.tcl	16 Oct 2003 10:50:12 -0000	1.6
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-export.tcl	22 Oct 2003 11:39:21 -0000	1.7
@@ -6,6 +6,7 @@
     @cvs-id $Id$  
 } {
     version_id:integer
+    {return_url {[export_vars -base "version-i18n-index" { version_id }]}}
 }
 
 db_1row package_version_info { 
@@ -14,13 +15,11 @@
     where  version_id = :version_id 
 }
 
-set return_url [export_vars -base "version-i18n-index" { version_id }]
-
 set page_title "Export Messages"
 set context [list \
                  [list "/acs-admin/apm/" "Package Manager"] \
                  [list [export_vars -base version-view { version_id }] "$pretty_name $version_name"] \
-                 [list $return_url "Internationalization"] $page_title]
+                 [list [export_vars -base "version-i18n-index" { version_id }] "Internationalization"] $page_title]
 
 set catalog_dir [lang::catalog::package_catalog_dir $package_key]
 
Index: openacs-4/packages/acs-admin/www/apm/version-i18n-import.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n-import.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/apm/version-i18n-import.adp	21 Oct 2003 14:06:50 -0000	1.2
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-import.adp	22 Oct 2003 11:39:21 -0000	1.3
@@ -2,10 +2,14 @@
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
 
-<p> Import complete. </p>
+<p>
+  Import complete.
+</p>
 
-<p> Catalog files have been loaded from the file system. </p>
+<p>
+  Catalog files have been loaded from the directory <b>@catalog_dir@</b>.
+</p>
 
 <p>
-<b>&raquo;</b> <a href="@return_url@">Return to internationalization management</a>
+  <b>&raquo;</b> <a href="@return_url@">Return</a>
 </p>
Index: openacs-4/packages/acs-admin/www/apm/version-i18n-import.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n-import.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/apm/version-i18n-import.tcl	16 Oct 2003 10:50:12 -0000	1.3
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-import.tcl	22 Oct 2003 11:39:21 -0000	1.4
@@ -1,13 +1,12 @@
 ad_page_contract {
-    Import messages from catalog files to the database.
-    Will overwrite texts in the database.
+    Import messages from catalog files to the database.  Will overwrite texts in the database.
 
     @author Peter Marklund (peter@collaboraid.biz)
     @creation-date 23 October 2002
     @cvs-id $Id$  
 } {
     version_id:integer,notnull    
-    {format "xml"}
+    {return_url {[export_vars -base "version-i18n-index" { version_id }]}}
 }
 
 db_1row package_version_info { 
@@ -16,12 +15,12 @@
     where  version_id = :version_id 
 }
 
-set return_url [export_vars -base "version-i18n-index" { version_id }]
-
 set page_title "Import Messages"
 set context [list \
                  [list "/acs-admin/apm/" "Package Manager"] \
                  [list [export_vars -base version-view { version_id }] "$pretty_name $version_name"] \
-                 [list $return_url "Internationalization"] $page_title]
+                 [list [export_vars -base "version-i18n-index" { version_id }] "Internationalization"] $page_title]
 
+set catalog_dir [lang::catalog::package_catalog_dir $package_key]
+
 lang::catalog::import -package_key $package_key