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.49.2.3 -r1.49.2.4
--- openacs-4/packages/acs-lang/acs-lang.info	3 Feb 2008 10:18:12 -0000	1.49.2.3
+++ openacs-4/packages/acs-lang/acs-lang.info	19 Mar 2008 18:44:22 -0000	1.49.2.4
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.4.0" url="http://openacs.org/repository/download/apm/acs-lang-5.4.0.apm">
+    <version name="5.4.1d2" url="http://openacs.org/repository/download/apm/acs-lang-5.4.1d2.apm">
         <owner url="mailto:peter@collaboraid.biz">Peter Marklund</owner>
         <summary>OpenACS Internationalization Support.</summary>
         <release-date>2008-02-03</release-date>
@@ -22,7 +22,7 @@
 Added the possibility to unregister messages.
 </description>
 
-        <provides url="acs-lang" version="5.4.0"/>
+        <provides url="acs-lang" version="5.4.1d2"/>
         <requires url="acs-kernel" version="5.4.0"/>
         <requires url="acs-translations" version="5.4.0"/>
         <requires url="ref-timezones" version="5.4.0"/>
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.33 -r1.33.2.1
--- openacs-4/packages/acs-lang/sql/oracle/ad-locales.sql	14 May 2007 20:30:22 -0000	1.33
+++ openacs-4/packages/acs-lang/sql/oracle/ad-locales.sql	19 Mar 2008 18:44:23 -0000	1.33.2.1
@@ -310,12 +310,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,
Index: openacs-4/packages/acs-lang/sql/oracle/upgrade/upgrade-5.4.1d1-5.4.1d2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/oracle/upgrade/upgrade-5.4.1d1-5.4.1d2.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/sql/oracle/upgrade/upgrade-5.4.1d1-5.4.1d2.sql	19 Mar 2008 18:44:23 -0000	1.1.2.1
@@ -0,0 +1,6 @@
+-- packages/acs-lang/sql/oracle/upgrade/upgrade-5.4.1d1-5.4.1d2.sql
+--
+-- language and country codes for Canada were wrong (ca, EN/FR)
+
+update ad_locales set language='en', country='CA' where locale='en_CA';
+update ad_locales set language='fr', country='CA' where locale='fr_CA';
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.29 -r1.29.2.1
--- 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	19 Mar 2008 18:44:23 -0000	1.29.2.1
@@ -319,12 +319,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,
Index: openacs-4/packages/acs-lang/sql/postgresql/upgrade/upgrade-5.4.1d1-5.4.1d2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/sql/postgresql/upgrade/upgrade-5.4.1d1-5.4.1d2.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/sql/postgresql/upgrade/upgrade-5.4.1d1-5.4.1d2.sql	19 Mar 2008 18:44:23 -0000	1.1.2.1
@@ -0,0 +1,6 @@
+-- packages/acs-lang/sql/postgresql/upgrade/upgrade-5.4.1d1-5.4.1d2.sql
+--
+-- language and country codes for Canada were wrong (ca, EN/FR)
+
+update ad_locales set language='en', country='CA' where locale='en_CA';
+update ad_locales set language='fr', country='CA' where locale='fr_CA';