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.29 -r1.30
--- openacs-4/packages/acs-lang/sql/postgresql/ad-locales.sql	14 May 2007 20:30:22 -0000	1.29
+++ openacs-4/packages/acs-lang/sql/postgresql/ad-locales.sql	7 Jun 2008 20:28:54 -0000	1.30
@@ -71,6 +71,13 @@
                         references ad_locales (locale) on delete cascade
 );
 
+-- alter user_preferences to add the locale column
+
+alter table user_preferences add
+  locale                varchar(30)
+                        constraint user_preferences_locale_fk
+                        references ad_locales(locale);
+
 --
 --
 -- And now for some default locales
@@ -319,12 +326,12 @@
 insert into ad_locales
        (locale, label, language, country, nls_language, nls_territory,
         nls_charset, mime_charset, default_p, enabled_p)
- values ('en_CA', 'English (CA)', 'ca', 'EN', 'English (Canada)', 'Canada', 'WE8DEC', 'ISO-8859-1', 'f', 'f');
+ values ('en_CA', 'English (CA)', 'en', 'CA', 'English (Canada)', 'Canada', 'WE8DEC', 'ISO-8859-1', 'f', 'f');
 
 insert into ad_locales
        (locale, label, language, country, nls_language, nls_territory,
         nls_charset, mime_charset, default_p, enabled_p)
- values ('fr_CA', 'French (CA)', 'ca', 'FR', 'French (Canada)', 'Canada', 'WE8DEC', 'ISO-8859-1', 'f', 'f');
+ values ('fr_CA', 'French (CA)', 'fr', 'CA', 'French (Canada)', 'Canada', 'WE8DEC', 'ISO-8859-1', 'f', 'f');
 
 insert into ad_locales
        (locale, label, language, country, nls_language, nls_territory,
