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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-export.tcl	23 Oct 2002 11:38:59 -0000	1.1
@@ -0,0 +1,13 @@
+ad_page_contract {
+    Export messages from the database to xml catalog files.
+
+    @author Peter Marklund (peter@collaboraid.biz)
+    @creation-date 23 October 2002
+    @cvs-id $Id: version-i18n-export.tcl,v 1.1 2002/10/23 11:38:59 peterm Exp $  
+} {
+    version_id:integer,notnull    
+}
+
+lang::catalog::export_package_to_files [apm_package_key_from_version_id $version_id]
+
+ad_returnredirect "version-i18n-index?version_id=$version_id"
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 -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-import.tcl	23 Oct 2002 11:38:59 -0000	1.1
@@ -0,0 +1,20 @@
+ad_page_contract {
+    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-i18n-import.tcl,v 1.1 2002/10/23 11:38:59 peterm Exp $  
+} {
+    version_id:integer,notnull    
+    {format "xml"}
+}
+
+set package_key [apm_package_key_from_version_id $version_id]
+if { [string equal $format "xml"] } {
+    lang::catalog::import_from_files $package_key
+} else {
+    lang::catalog::import_from_tcl_files $package_key
+}
+
+ad_returnredirect "version-i18n-index?version_id=$version_id"
Index: openacs-4/packages/acs-admin/www/apm/version-i18n-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n-index.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-index.adp	23 Oct 2002 11:38:59 -0000	1.1
@@ -0,0 +1,21 @@
+<master>
+<property name="title">@page_title@</property>
+<property name="context_bar">@context_bar@</property>
+
+<ul>
+<p>
+<li><a href="version-i18n?version_id=@version_id@">Convert adp and tcl files to using the message catalog</a></li>
+</p>
+
+<p>
+<li><a href="version-i18n-export?version_id=@version_id@">Export (dump) messages from database to xml catalog files</a></li>
+</p>
+
+<p>
+<li><a href="version-i18n-import?version_id=@version_id@&format=xml">Import messages from xml catalog files to database</a> (overwrites texts in the database)</li>
+</p>
+
+<p>
+<li><a href="version-i18n-import?version_id=@version_id@&format=tcl">Import messages from old tcl-based catalog files (.cat files) to database</a> (overwrites texts in the database)</li>
+</p>
+</ul>
Index: openacs-4/packages/acs-admin/www/apm/version-i18n-index.adp~
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/Attic/version-i18n-index.adp~,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-index.adp~	23 Oct 2002 11:38:59 -0000	1.1
@@ -0,0 +1,4 @@
+<master>
+<property name="title">@page_title@</property>
+<property name="context_bar">@context_bar@</property>
+
Index: openacs-4/packages/acs-admin/www/apm/version-i18n-index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n-index.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-index.tcl	23 Oct 2002 11:38:59 -0000	1.1
@@ -0,0 +1,16 @@
+ad_page_contract {
+    Manage Internationalization for a certain package version.
+
+    @author Peter Marklund (peter@collaboraid.biz)
+    @creation-date 23 October 2002
+    @cvs-id $Id: version-i18n-index.tcl,v 1.1 2002/10/23 11:38:59 peterm Exp $  
+} {
+    version_id:integer,notnull    
+}
+
+db_1row package_version_info "select pretty_name, version_name from apm_package_version_info where version_id = :version_id"
+
+set page_title "Manage Internationalization of $pretty_name $version_name"
+set context_bar [ad_context_bar $page_title]
+
+ad_return_template
Index: openacs-4/packages/acs-admin/www/apm/version-i18n-index.tcl~
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/Attic/version-i18n-index.tcl~,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-index.tcl~	23 Oct 2002 11:38:59 -0000	1.1
@@ -0,0 +1,12 @@
+ad_page_contract {
+    Show internationalization status for a certain package version.
+
+    @author Peter Marklund (peter@collaboraid.biz)
+    @creation-date 8 October 2002
+    @cvs-id $Id: version-i18n-index.tcl~,v 1.1 2002/10/23 11:38:59 peterm Exp $  
+} {
+    version_id:integer,notnull    
+    {pre_select_files_p "1"}
+    {show_status_p "0"}
+    {file_type adp}
+}
Index: openacs-4/packages/acs-admin/www/apm/version-i18n.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/apm/version-i18n.tcl	11 Oct 2002 17:57:47 -0000	1.2
+++ openacs-4/packages/acs-admin/www/apm/version-i18n.tcl	23 Oct 2002 11:38:59 -0000	1.3
@@ -1,5 +1,6 @@
 ad_page_contract {
-    Show internationalization status for a certain package version.
+    A form to help semi-automate the conversion of tcl and adp files from using literal
+    text strings to using the message catalog.
 
     @author Peter Marklund (peter@collaboraid.biz)
     @creation-date 8 October 2002
@@ -13,7 +14,7 @@
 
 db_1row package_version_info "select pretty_name, version_name from apm_package_version_info where version_id = :version_id"
 
-set page_title "Internationalization of $pretty_name $version_name"
+set page_title "Message catalog lookups for adp and tcl files of $pretty_name $version_name"
 set context_bar [ad_context_bar $page_title]
 
 set file_option_list [list]
Index: openacs-4/packages/acs-admin/www/apm/version-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-view.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-admin/www/apm/version-view.tcl	9 Oct 2002 16:03:50 -0000	1.6
+++ openacs-4/packages/acs-admin/www/apm/version-view.tcl	23 Oct 2002 11:38:59 -0000	1.7
@@ -218,7 +218,7 @@
 <li><a href=\"version-files?version_id=$version_id\">Manage file information</a>
 <li><a href=\"version-parameters?version_id=$version_id\">Manage parameter information</a>
 <li><a href=\"version-generate-info?version_id=$version_id\">Display an XML package specification file for this version</a>
-<li><a href=\"version-i18n?version_id=$version_id\">Manage Internationalization</a>
+<li><a href=\"version-i18n-index?version_id=$version_id\">Manage Internationalization</a>
 "
 
 if { ![info exists installed_version_id] || $installed_version_id == $version_id && \