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 -N -r1.64.2.1 -r1.64.2.2
--- openacs-4/packages/acs-lang/acs-lang.info 13 Mar 2019 11:07:47 -0000 1.64.2.1
+++ openacs-4/packages/acs-lang/acs-lang.info 14 Mar 2019 10:23:05 -0000 1.64.2.2
@@ -9,7 +9,7 @@
f
t
-
+
Peter Marklund
OpenACS Internationalization Support.
2017-08-06
@@ -20,7 +20,7 @@
GPL
3
-
+
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 -N -r1.38 -r1.38.2.1
--- openacs-4/packages/acs-lang/sql/oracle/ad-locales.sql 7 Aug 2017 23:47:56 -0000 1.38
+++ openacs-4/packages/acs-lang/sql/oracle/ad-locales.sql 14 Mar 2019 10:23:05 -0000 1.38.2.1
@@ -17,7 +17,7 @@
locale varchar2(30)
constraint ad_locales_locale_pk
primary key,
- language char(3) constraint ad_locales_language_nn
+ language varchar2(3) constraint ad_locales_language_nn
not null,
country char(2) constraint ad_locales_country_nn
not null,
Index: openacs-4/packages/acs-lang/sql/oracle/upgrade/upgrade-5.10.0d2-5.10.0d3.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/oracle/upgrade/Attic/upgrade-5.10.0d2-5.10.0d3.sql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/sql/oracle/upgrade/upgrade-5.10.0d2-5.10.0d3.sql 14 Mar 2019 10:23:05 -0000 1.1.2.1
@@ -0,0 +1,11 @@
+begin;
+
+drop view enabled_locales;
+
+alter table ad_locales modify column language varchar2(3);
+
+create or replace view enabled_locales as
+select * from ad_locales
+where enabled_p = 't';
+
+end;
Index: openacs-4/packages/acs-lang/sql/postgresql/ad-locales.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/postgresql/ad-locales.sql,v
diff -u -N -r1.34 -r1.34.2.1
--- openacs-4/packages/acs-lang/sql/postgresql/ad-locales.sql 7 Aug 2017 23:47:56 -0000 1.34
+++ openacs-4/packages/acs-lang/sql/postgresql/ad-locales.sql 14 Mar 2019 10:23:05 -0000 1.34.2.1
@@ -19,7 +19,7 @@
locale varchar(30)
constraint ad_locales_locale_pk
primary key,
- language char(3)
+ language varchar(3)
constraint ad_locales_language_nn
not null,
country char(2)
Index: openacs-4/packages/acs-lang/sql/postgresql/upgrade/upgrade-5.10.0d2-5.10.0d3.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/postgresql/upgrade/Attic/upgrade-5.10.0d2-5.10.0d3.sql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/sql/postgresql/upgrade/upgrade-5.10.0d2-5.10.0d3.sql 14 Mar 2019 10:23:06 -0000 1.1.2.1
@@ -0,0 +1,11 @@
+begin;
+
+drop view enabled_locales;
+
+alter table ad_locales alter column language set data type varchar(3);
+
+create view enabled_locales as
+select * from ad_locales
+where enabled_p = 't';
+
+end;
Index: openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl,v
diff -u -N -r1.54.2.1 -r1.54.2.2
--- openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl 13 Mar 2019 13:37:18 -0000 1.54.2.1
+++ openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl 14 Mar 2019 10:23:06 -0000 1.54.2.2
@@ -385,10 +385,6 @@
@see lang::util::default_locale_from_lang
} {
- # LARS:
- # Note that this query does not use bind variables, because these cause the query to not
- # match any rows in Oracle when the language key is less than 3 characters,
- # because the column is a char(3), not a varchar2(3).
return [db_string default_locale_from_lang {
select locale
from ad_locales l