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.31.2.5 -r1.31.2.6
--- openacs-4/packages/acs-lang/acs-lang.info 21 Jan 2004 19:03:11 -0000 1.31.2.5
+++ openacs-4/packages/acs-lang/acs-lang.info 6 Feb 2004 09:34:21 -0000 1.31.2.6
@@ -7,7 +7,7 @@
t
t
-
+
Peter Marklund
OpenACS Internationalization Support.
2004-01-21
@@ -16,7 +16,7 @@
request processor hooks, templating, accessing and managing the message catalog, and
locale-specific formatting functions for localizing dates, times, monetary amounts etc.
-
+
Index: openacs-4/packages/acs-lang/sql/oracle/message-catalog.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/oracle/message-catalog.sql,v
diff -u -r1.10.2.3 -r1.10.2.4
--- openacs-4/packages/acs-lang/sql/oracle/message-catalog.sql 11 Dec 2003 14:35:09 -0000 1.10.2.3
+++ openacs-4/packages/acs-lang/sql/oracle/message-catalog.sql 6 Feb 2004 09:34:02 -0000 1.10.2.4
@@ -70,7 +70,10 @@
into an nsv_array.
';
-create table lang_messages_audit (
+create table lang_messages_audit (
+ audit_id integer
+ constraint lang_messages_audit_pk
+ primary key,
message_key varchar2(200)
constraint lang_messages_audit_key_nn
not null,
@@ -96,14 +99,14 @@
overwrite_user integer
constraint lang_messages_audit_ou_fk
references users (user_id),
- constraint lang_messages_audit_pk
- primary key (package_key, message_key, locale, overwrite_date),
constraint lang_messages_audit_fk
foreign key (message_key, package_key)
references lang_message_keys(message_key, package_key)
on delete cascade
);
+create sequence lang_messages_audit_id_seq;
+
-- ****************************************************************************
-- * The lang_translate_columns table holds the columns that require translation.
-- * It is needed to generate the user interface for translating the web site.
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-lang/sql/oracle/upgrade/upgrade-5.0.0-5.0.1.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/acs-lang/sql/postgresql/message-catalog.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/postgresql/message-catalog.sql,v
diff -u -r1.13.2.3 -r1.13.2.4
--- openacs-4/packages/acs-lang/sql/postgresql/message-catalog.sql 11 Dec 2003 14:35:09 -0000 1.13.2.3
+++ openacs-4/packages/acs-lang/sql/postgresql/message-catalog.sql 6 Feb 2004 09:34:03 -0000 1.13.2.4
@@ -66,6 +66,9 @@
);
create table lang_messages_audit (
+ audit_id integer
+ constraint lang_messages_audit_pk
+ primary key,
message_key varchar(200)
constraint lang_messages_audit_key_nn
not null,
@@ -93,14 +96,13 @@
overwrite_user integer
constraint lang_messages_audit_ou_fk
references users (user_id),
- constraint lang_messages_audit_pk
- primary key (package_key, message_key, locale, overwrite_date),
constraint lang_messages_audit_fk
foreign key (message_key, package_key)
references lang_message_keys(message_key, package_key)
on delete cascade
);
+create sequence lang_messages_audit_id_seq;
-- ****************************************************************************
-- * The lang_translate_columns table holds the columns that require translation.
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-lang/sql/postgresql/upgrade/upgrade-5.0.0-5.0.1.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/acs-lang/tcl/lang-audit-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-audit-procs-oracle.xql,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/acs-lang/tcl/lang-audit-procs-oracle.xql 9 Dec 2003 13:41:52 -0000 1.2.2.1
+++ openacs-4/packages/acs-lang/tcl/lang-audit-procs-oracle.xql 6 Feb 2004 09:34:03 -0000 1.2.2.2
@@ -4,10 +4,10 @@
- insert into lang_messages_audit (package_key, message_key, locale, old_message, comment_text, overwrite_user,
+ insert into lang_messages_audit (audit_id, package_key, message_key, locale, old_message, comment_text, overwrite_user,
deleted_p, sync_time, conflict_p, upgrade_status)
- values (:package_key, :message_key, :locale, empty_clob(), empty_clob(), :overwrite_user,
- :deleted_p, :sync_time, :conflict_p, :upgrade_status)
+ values (lang_messages_audit_id_seq.nextval, :package_key, :message_key, :locale, empty_clob(), empty_clob(),
+ :overwrite_user, :deleted_p, :sync_time, :conflict_p, :upgrade_status)
returning old_message, comment_text into :1, :2
Index: openacs-4/packages/acs-lang/tcl/lang-audit-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-audit-procs-postgresql.xql,v
diff -u -r1.3.2.1 -r1.3.2.2
--- openacs-4/packages/acs-lang/tcl/lang-audit-procs-postgresql.xql 9 Dec 2003 13:41:52 -0000 1.3.2.1
+++ openacs-4/packages/acs-lang/tcl/lang-audit-procs-postgresql.xql 6 Feb 2004 09:34:03 -0000 1.3.2.2
@@ -4,10 +4,10 @@
- insert into lang_messages_audit (package_key, message_key, locale, old_message, comment_text, overwrite_user,
+ insert into lang_messages_audit (audit_id, package_key, message_key, locale, old_message, comment_text, overwrite_user,
deleted_p, sync_time, conflict_p, upgrade_status)
- values (:package_key, :message_key, :locale, :old_message, :comment, :overwrite_user,
- :deleted_p, :sync_time, :conflict_p, :upgrade_status)
+ values (nextval('lang_messages_audit_id_seq'::text), :package_key, :message_key, :locale, :old_message,
+ :comment, :overwrite_user, :deleted_p, :sync_time, :conflict_p, :upgrade_status)
Index: openacs-4/packages/acs-lang/tcl/lang-catalog-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-catalog-procs-oracle.xql,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/acs-lang/tcl/lang-catalog-procs-oracle.xql 9 Dec 2003 13:41:52 -0000 1.1.2.1
+++ openacs-4/packages/acs-lang/tcl/lang-catalog-procs-oracle.xql 6 Feb 2004 09:34:03 -0000 1.1.2.2
@@ -36,7 +36,7 @@
where lma1.package_key = :package_key
and lma1.locale = :locale
and lma1.sync_time is not null
- and lma1.overwrite_date = (select max(lma2.overwrite_date)
+ and lma1.audit_id = (select max(lma2.audit_id)
from lang_messages_audit lma2
where lma2.package_key = lma1.package_key
and lma2.message_key = lma1.message_key
Index: openacs-4/packages/acs-lang/tcl/lang-catalog-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-catalog-procs-postgresql.xql,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/acs-lang/tcl/lang-catalog-procs-postgresql.xql 9 Dec 2003 13:41:52 -0000 1.1.2.1
+++ openacs-4/packages/acs-lang/tcl/lang-catalog-procs-postgresql.xql 6 Feb 2004 09:34:03 -0000 1.1.2.2
@@ -37,7 +37,7 @@
where lma1.package_key = :package_key
and lma1.locale = :locale
and lma1.sync_time is not null
- and lma1.overwrite_date = (select max(lma2.overwrite_date)
+ and lma1.audit_id = (select max(lma2.audit_id)
from lang_messages_audit lma2
where lma2.package_key = lma1.package_key
and lma2.message_key = lma1.message_key