Index: openacs-4/packages/acs-lang/acs-lang.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/acs-lang.info,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/acs-lang/acs-lang.info	8 Feb 2003 18:54:34 -0000	1.19
+++ openacs-4/packages/acs-lang/acs-lang.info	13 Feb 2003 15:02:40 -0000	1.20
@@ -7,29 +7,28 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="4.7d5" url="http://www.openacs.org/acs-repository/download/apm/acs-lang-4.7d5.apm">
+    <version name="4.7d6" url="http://www.openacs.org/acs-repository/download/apm/acs-lang-4.7d6.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:peter@collaboraid.biz">Peter Marklund</owner>
         <summary>OpenACS Internationalization Utilities</summary>
-        <release-date>2003-02-08</release-date>
+        <release-date>2003-02-13</release-date>
         <vendor url="http://www.collaboraid.biz">Collaboraid</vendor>
         <description format="text/plain">OpenACS Internationalization Utilities. Routines for manipulating Locales,
 request processor hooks, templating, message catalog, and
 locale-specific formatting functions.
 </description>
 
-        <provides url="acs-lang" version="4.7d5"/>
+        <provides url="acs-lang" version="4.7d6"/>
         <requires url="acs-kernel" version="4.1"/>
 
         <files>
             <file type="package_spec" path="acs-lang.info"/>
             <file type="shell" path="bin/check-catalog-file-path.pl"/>
             <file type="shell" path="bin/check-catalog.sh"/>
             <file type="shell" path="bin/mygrep"/>
-            <file type="message_catalog" path="catalog/acs-lang.TH_TH.TIS-620.xml"/>
             <file type="message_catalog" path="catalog/acs-lang.da_DK.ISO-8859-1.xml"/>
             <file path="catalog/acs-lang.de_DE.ISO-8859-1.xml"/>
             <file type="message_catalog" path="catalog/acs-lang.el_GR.ISO-8859-7.xml"/>
@@ -43,6 +42,7 @@
             <file type="message_catalog" path="catalog/acs-lang.ru_RU.windows-1251.xml"/>
             <file type="message_catalog" path="catalog/acs-lang.sh_HR.ISO-8859-5.xml"/>
             <file type="message_catalog" path="catalog/acs-lang.sv_SE.ISO-8859-1.xml"/>
+            <file type="message_catalog" path="catalog/acs-lang.TH_TH.TIS-620.xml"/>
             <file type="data_model_create" db_type="oracle" path="sql/oracle/acs-lang-create.sql"/>
             <file type="data_model" db_type="oracle" path="sql/oracle/ad-locales-drop.sql"/>
             <file type="data_model" db_type="oracle" path="sql/oracle/ad-locales.sql"/>
@@ -53,6 +53,7 @@
             <file type="data_model_upgrade" db_type="oracle" path="sql/oracle/upgrade/upgrade-4.7d2-4.7d3.sql"/>
             <file type="data_model_upgrade" db_type="oracle" path="sql/oracle/upgrade/upgrade-4.7d3-4.7d4.sql"/>
             <file type="data_model_upgrade" db_type="oracle" path="sql/oracle/upgrade/upgrade-4.7d4-4.7d5.sql"/>
+            <file type="data_model_upgrade" db_type="oracle" path="sql/oracle/upgrade/upgrade-4.7d5-4.7d6.sql"/>
             <file type="data_model_create" db_type="postgresql" path="sql/postgresql/acs-lang-create.sql"/>
             <file type="data_model" db_type="postgresql" path="sql/postgresql/ad-locales-drop.sql"/>
             <file type="data_model" db_type="postgresql" path="sql/postgresql/ad-locales.sql"/>
@@ -101,17 +102,17 @@
             <file type="content_page" path="www/admin/index.adp"/>
             <file type="content_page" path="www/admin/index.tcl"/>
             <file type="content_page" path="www/admin/load-catalog-files.tcl"/>
-            <file type="content_page" path="www/admin/locale-delete-confirm.adp"/>
             <file type="content_page" path="www/admin/locale-delete.adp"/>
+            <file type="content_page" path="www/admin/locale-delete-confirm.adp"/>
             <file type="content_page" path="www/admin/locale-delete.tcl"/>
             <file type="content_page" path="www/admin/locale-edit.adp"/>
             <file type="content_page" path="www/admin/locale-edit.tcl"/>
             <file type="content_page" path="www/admin/locale-make-default.tcl"/>
             <file type="content_page" path="www/admin/locale-new.adp"/>
             <file type="content_page" path="www/admin/locale-new.tcl"/>
+            <file type="content_page" path="www/admin/locales.adp"/>
             <file type="content_page" path="www/admin/locales-tabs.adp"/>
             <file type="content_page" path="www/admin/locales-tabs.tcl"/>
-            <file type="content_page" path="www/admin/locales.adp"/>
             <file type="content_page" path="www/admin/locales.tcl"/>
             <file type="content_page" path="www/admin/localized-message-new-2.adp"/>
             <file type="content_page" path="www/admin/localized-message-new.adp"/>
@@ -122,28 +123,28 @@
             <file type="content_page" path="www/admin/lookups-include.tcl"/>
             <file type="content_page" path="www/admin/master.adp"/>
             <file type="content_page" path="www/admin/reload-cache.tcl"/>
+            <file type="content_page" path="www/admin/set-system-timezone.adp"/>
             <file type="query_file" db_type="oracle" path="www/admin/set-system-timezone-oracle.xql"/>
             <file type="query_file" db_type="postgresql" path="www/admin/set-system-timezone-postgresql.xql"/>
-            <file type="content_page" path="www/admin/set-system-timezone.adp"/>
             <file type="content_page" path="www/admin/set-system-timezone.tcl"/>
             <file type="content_page" path="www/admin/test/catalog-test.adp"/>
             <file type="content_page" path="www/admin/test/catalog-test.tcl"/>
             <file type="content_page" path="www/admin/test/compile.tcl"/>
+            <file type="content_page" path="www/admin/test/format-test.adp"/>
             <file type="query_file" db_type="oracle" path="www/admin/test/format-test-oracle.xql"/>
             <file type="query_file" db_type="postgresql" path="www/admin/test/format-test-postgresql.xql"/>
-            <file type="content_page" path="www/admin/test/format-test.adp"/>
             <file type="content_page" path="www/admin/test/format-test.tcl"/>
             <file type="content_page" path="www/admin/test/index.html"/>
             <file type="content_page" path="www/admin/test/show-catalog.adp"/>
             <file type="content_page" path="www/admin/test/show-catalog.tcl"/>
             <file type="content_page" path="www/admin/test/show.tcl"/>
+            <file type="content_page" path="www/admin/test/test.adp"/>
             <file type="query_file" db_type="oracle" path="www/admin/test/test-oracle.xql"/>
             <file type="query_file" db_type="postgresql" path="www/admin/test/test-postgresql.xql"/>
-            <file type="content_page" path="www/admin/test/test.adp"/>
             <file type="content_page" path="www/admin/test/test.tcl"/>
+            <file type="content_page" path="www/admin/test/timezone.adp"/>
             <file type="query_file" db_type="oracle" path="www/admin/test/timezone-oracle.xql"/>
             <file type="query_file" db_type="postgresql" path="www/admin/test/timezone-postgresql.xql"/>
-            <file type="content_page" path="www/admin/test/timezone.adp"/>
             <file type="content_page" path="www/admin/test/timezone.tcl"/>
             <file type="content_page" path="www/admin/test/tz-test.tcl"/>
             <file type="content_page" path="www/admin/translator-mode-toggle.tcl"/>
Index: openacs-4/packages/acs-lang/sql/oracle/ad-locales.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/oracle/ad-locales.sql,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-lang/sql/oracle/ad-locales.sql	21 Jan 2003 16:27:24 -0000	1.8
+++ openacs-4/packages/acs-lang/sql/oracle/ad-locales.sql	13 Feb 2003 15:03:50 -0000	1.9
@@ -162,11 +162,13 @@
  values ('TH_TH', 'Thai (TH)', 'th', 'TH', 'THAI', 'THAILAND', 'TH8TISASCII', 'TIS-620', 't');
 
 create table ad_locale_user_prefs (
-       user_id                        integer
-                                      primary key
-                                      references users (user_id),
-       locale                         varchar2(30) not null
-                                      constraint
-                                      trb_language_preference_lid_fk
-                                      references ad_locales (locale)
+  user_id               integer
+                        constraint ad_locale_user_prefs_users_fk
+                        references users (user_id) on delete cascade,
+  package_id            integer
+                        constraint lang_package_l_u_package_id_fk
+                        references apm_packages(package_id) on delete cascade,
+  locale                varchar(30) not null
+                        constraint trb_language_preference_lid_fk
+                        references ad_locales (locale) on delete cascade
 );
Index: openacs-4/packages/acs-lang/sql/oracle/upgrade/upgrade-4.7d5-4.7d6.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/oracle/upgrade/upgrade-4.7d5-4.7d6.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/sql/oracle/upgrade/upgrade-4.7d5-4.7d6.sql	13 Feb 2003 15:03:08 -0000	1.1
@@ -0,0 +1,5 @@
+-- We forgot to add the package_id column in the Oracle version of this
+-- table
+alter table ad_locale_user_prefs add  package_id integer
+                                      constraint lang_package_l_u_package_id_fk
+                                      references apm_packages(package_id) on delete cascade;