Index: openacs-4/packages/acs-kernel/sql/oracle/community-core-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/community-core-create.sql,v
diff -u -r1.15 -r1.15.4.1
--- openacs-4/packages/acs-kernel/sql/oracle/community-core-create.sql 26 Sep 2006 14:48:02 -0000 1.15
+++ openacs-4/packages/acs-kernel/sql/oracle/community-core-create.sql 22 Mar 2008 22:25:59 -0000 1.15.4.1
@@ -574,7 +574,6 @@
constraint user_prefs_dont_spam_me_p_ck
check (dont_spam_me_p in ('t','f')),
email_type varchar2(64),
- locale varchar2(30),
timezone varchar2(100)
);
Index: openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql,v
diff -u -r1.24 -r1.24.4.1
--- openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql 25 Sep 2006 17:59:16 -0000 1.24
+++ openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql 22 Mar 2008 22:25:59 -0000 1.24.4.1
@@ -529,7 +529,6 @@
language_preference char(2) default 'en',
dont_spam_me_p boolean default 'f',
email_type varchar(64),
- locale varchar(30),
timezone varchar(100)
);
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.49.2.4 -r1.49.2.5
--- openacs-4/packages/acs-lang/acs-lang.info 19 Mar 2008 18:44:22 -0000 1.49.2.4
+++ openacs-4/packages/acs-lang/acs-lang.info 22 Mar 2008 22:25:59 -0000 1.49.2.5
@@ -7,7 +7,7 @@
t
t
-
+
Peter Marklund
OpenACS Internationalization Support.
2008-02-03
@@ -22,7 +22,7 @@
Added the possibility to unregister messages.
-
+
Index: openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml,v
diff -u -r1.28 -r1.28.2.1
--- openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml 18 Nov 2007 21:27:10 -0000 1.28
+++ openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml 22 Mar 2008 22:25:59 -0000 1.28.2.1
@@ -6,6 +6,7 @@
Change locale
English
+ Error changing locale
French
German
Locale
@@ -59,6 +60,7 @@
The label of the locale, in the locale's language. This should be different for each locale. This should not be English unless the locale is "en".
Translated messages on this page (%locale%)
+ Your locale %user_locale% couldn't be set, probably because it's not available.
Your locale setting for %package_name%. If set, this will override the site-wide setting in this particular application.
Your locale setting for the whole site
Your Preferred Locale
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.33.2.1 -r1.33.2.2
--- openacs-4/packages/acs-lang/sql/oracle/ad-locales.sql 19 Mar 2008 18:44:23 -0000 1.33.2.1
+++ openacs-4/packages/acs-lang/sql/oracle/ad-locales.sql 22 Mar 2008 22:26:00 -0000 1.33.2.2
@@ -68,6 +68,16 @@
references ad_locales (locale) on delete cascade
);
+
+-- alter user_preferences to add the locale column
+
+alter table user_preferences add (
+ locale varchar2(30)
+ constraint user_preferences_locale_fk
+ references ad_locales(locale)
+);
+
+
--
--
-- And now for some default locales
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-lang/sql/oracle/upgrade/upgrade-5.4.1d2-5.4.1d3.sql'.
Fisheye: No comparison available. Pass `N' to diff?
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.2.1 -r1.29.2.2
--- openacs-4/packages/acs-lang/sql/postgresql/ad-locales.sql 19 Mar 2008 18:44:23 -0000 1.29.2.1
+++ openacs-4/packages/acs-lang/sql/postgresql/ad-locales.sql 22 Mar 2008 22:26:00 -0000 1.29.2.2
@@ -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
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-lang/sql/postgresql/upgrade/upgrade-5.4.1d2-5.4.1d3.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/acs-lang/www/change-locale.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/change-locale.tcl,v
diff -u -r1.2 -r1.2.14.1
--- openacs-4/packages/acs-lang/www/change-locale.tcl 28 Oct 2002 12:32:49 -0000 1.2
+++ openacs-4/packages/acs-lang/www/change-locale.tcl 22 Mar 2008 22:26:00 -0000 1.2.14.1
@@ -5,6 +5,9 @@
return_url
}
-lang::user::set_locale $user_locale
-
-ad_returnredirect $return_url
+if { [catch {lang::user::set_locale $user_locale} errmsg] } {
+ ns_log Error "acs-lang/www/change-locale crashed calling lang::user::set_locale with user_locale='$user_locale'\n$errmsg"
+ ad_return_error [_ acs-lang.Error_changing_locale] [_ acs-lang.User_locale_not_set]
+} else {
+ ad_returnredirect $return_url
+}
Fisheye: Tag 1.5.8.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-lang/www/locale-set.tcl'.
Fisheye: No comparison available. Pass `N' to diff?