Index: openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl 15 Feb 2003 23:59:16 -0000 1.12
+++ openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl 17 Feb 2003 23:04:57 -0000 1.13
@@ -155,7 +155,9 @@
} {
array set filename_info {}
- set regexp_pattern "(?i)(\[^/\]+)/catalog/(.*)\\1\\.(\[a-z\]{2}_\[a-z\]{2})\\.(\[^.\]+)\\.xml\$"
+ # Catalog filepaths are on the form
+ # package_key/catalog/optional_prefix_package_key.language.country.charset.xml
+ set regexp_pattern "(?i)(\[^/\]+)/catalog/(.*)\\1\\.(\[a-z\]{2,3}_\[a-z\]{2})\\.(\[^.\]+)\\.xml\$"
if { ![regexp $regexp_pattern $file_path match package_key prefix locale charset] } {
return [list]
}
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.20 -r1.21
--- openacs-4/packages/acs-lang/acs-lang.info 13 Feb 2003 15:02:40 -0000 1.20
+++ openacs-4/packages/acs-lang/acs-lang.info 17 Feb 2003 23:00:49 -0000 1.21
@@ -6,15 +6,15 @@
OpenACS Localization Utils
t
t
-
-
+
+
oracle
postgresql
Peter Marklund
OpenACS Internationalization Utilities
- 2003-02-13
+ 2003-02-17
Collaboraid
OpenACS Internationalization Utilities. Routines for manipulating Locales,
request processor hooks, templating, message catalog, and
@@ -29,6 +29,7 @@
+
@@ -38,11 +39,11 @@
+
-
@@ -54,6 +55,7 @@
+
@@ -63,6 +65,7 @@
+
@@ -102,17 +105,17 @@
-
+
-
+
@@ -123,28 +126,28 @@
-
+
-
+
-
+
-
+
@@ -160,11 +163,9 @@
-
-
-
+
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.9 -r1.10
--- openacs-4/packages/acs-lang/sql/oracle/ad-locales.sql 13 Feb 2003 15:03:50 -0000 1.9
+++ openacs-4/packages/acs-lang/sql/oracle/ad-locales.sql 17 Feb 2003 23:01:34 -0000 1.10
@@ -17,7 +17,7 @@
locale varchar2(30)
constraint ad_locale_abbrev_pk
primary key,
- language char(2) constraint ad_language_name_nil
+ language char(3) constraint ad_language_name_nil
not null,
country char(2) constraint ad_country_name_nil
not null,
Index: openacs-4/packages/acs-lang/sql/oracle/upgrade/upgrade-4.7d6-4.7d7.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/oracle/upgrade/upgrade-4.7d6-4.7d7.sql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/sql/oracle/upgrade/upgrade-4.7d6-4.7d7.sql 17 Feb 2003 23:02:17 -0000 1.1
@@ -0,0 +1,2 @@
+-- We now allow for three character language codes
+alter table ad_locales modify language char(3);
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 -r1.8 -r1.9
--- openacs-4/packages/acs-lang/sql/postgresql/ad-locales.sql 21 Jan 2003 16:27:53 -0000 1.8
+++ openacs-4/packages/acs-lang/sql/postgresql/ad-locales.sql 17 Feb 2003 23:02:57 -0000 1.9
@@ -19,7 +19,7 @@
locale varchar(30)
constraint ad_locale_abbrev_pk
primary key,
- language char(2)
+ language char(3)
constraint ad_language_name_nil
not null,
country char(2)
Index: openacs-4/packages/acs-lang/sql/postgresql/upgrade/upgrade-4.7d6-4.7d7.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/postgresql/upgrade/upgrade-4.7d6-4.7d7.sql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/sql/postgresql/upgrade/upgrade-4.7d6-4.7d7.sql 17 Feb 2003 23:03:32 -0000 1.1
@@ -0,0 +1,30 @@
+-- We now allow for three character language codes
+create table temp as select * from ad_locales;
+drop table ad_locales;
+create table ad_locales (
+ locale varchar(30)
+ constraint ad_locale_abbrev_pk
+ primary key,
+ language char(3)
+ constraint ad_language_name_nil
+ not null,
+ country char(2)
+ constraint ad_country_name_nil
+ not null,
+ variant varchar(30),
+ label varchar(200)
+ constraint ad_locale_name_nil
+ not null
+ constraint ad_locale_name_unq
+ unique,
+ nls_language varchar(30)
+ constraint ad_locale_nls_lang_nil
+ not null,
+ nls_territory varchar(30),
+ nls_charset varchar(30),
+ mime_charset varchar(30),
+ -- is this the default locale for its language
+ default_p boolean default 'f'
+);
+insert into ad_locales select * from temp;
+drop table temp;
Index: openacs-4/packages/acs-lang/www/admin/locale-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/locale-new.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-lang/www/admin/locale-new.adp 12 Nov 2002 15:34:23 -0000 1.4
+++ openacs-4/packages/acs-lang/www/admin/locale-new.adp 17 Feb 2003 23:04:07 -0000 1.5
@@ -2,7 +2,7 @@
Create new locale
@context_bar@
-Please, fill in the fields to create a new locale.
+Please fill in the fields to create a new locale.
Index: openacs-4/packages/acs-lang/www/admin/locale-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/locale-new.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-lang/www/admin/locale-new.tcl 21 Oct 2002 11:39:14 -0000 1.2
+++ openacs-4/packages/acs-lang/www/admin/locale-new.tcl 17 Feb 2003 23:04:07 -0000 1.3
@@ -42,11 +42,11 @@
}
}
-element create locale_creation country -label "Country (2 digit ISO-code)" \
+element create locale_creation country -label "Country (2 digit ISO 3166 code)" \
-datatype text -widget text -html { maxLength 2 size 2 }
-element create locale_creation language -label "Language (2 digit ISO-code)" \
- -datatype text -widget text -html { maxLength 2 size 2 }
+element create locale_creation language -label "Language (2 digit ISO 639-1 code, or 3 digit ISO 639-2 code)" \
+ -datatype text -widget text -html { maxLength 3 size 3 }
element create locale_creation label -label "Label" -datatype text