Index: openacs-4/packages/calendar/catalog/calendar.da_DK.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.da_DK.ISO-8859-1.xml,v diff -u -r1.1 -r1.2 --- openacs-4/packages/calendar/catalog/calendar.da_DK.ISO-8859-1.xml 7 Nov 2002 12:45:03 -0000 1.1 +++ openacs-4/packages/calendar/catalog/calendar.da_DK.ISO-8859-1.xml 4 Dec 2002 09:44:25 -0000 1.2 @@ -2,7 +2,6 @@ - TILF�J Tilf�j Tilf�j Emne Tilf�j Gentagelse Index: openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml,v diff -u -r1.1 -r1.2 --- openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml 7 Nov 2002 12:45:03 -0000 1.1 +++ openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml 4 Dec 2002 09:44:25 -0000 1.2 @@ -2,7 +2,6 @@ - ADD Add Add Item Add Recurrence Index: openacs-4/packages/calendar/tcl/cal-item-2-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/cal-item-2-procs-oracle.xql,v diff -u -r1.7 -r1.8 --- openacs-4/packages/calendar/tcl/cal-item-2-procs-oracle.xql 18 Nov 2002 18:01:10 -0000 1.7 +++ openacs-4/packages/calendar/tcl/cal-item-2-procs-oracle.xql 4 Dec 2002 09:44:35 -0000 1.8 @@ -23,8 +23,8 @@ 0 as n_attachments, start_date as start_date, end_date as end_date, - to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as full_start_date, - to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as full_end_date, + to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_start_date, + to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_end_date, nvl(e.name, a.name) as name, nvl(e.description, a.description) as description, recurrence_id, @@ -60,8 +60,8 @@ to_char(start_date, 'MM/DD/YYYY') as pretty_short_start_date, to_char(end_date, 'HH:MIpm') as end_time, end_date as end_date, - to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as full_start_date, - to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as full_end_date, + to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_start_date, + to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_end_date, nvl(e.name, a.name) as name, nvl(e.description, a.description) as description, recurrence_id, Index: openacs-4/packages/calendar/tcl/cal-item-2-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/cal-item-2-procs-postgresql.xql,v diff -u -r1.6 -r1.7 --- openacs-4/packages/calendar/tcl/cal-item-2-procs-postgresql.xql 18 Nov 2002 18:01:10 -0000 1.6 +++ openacs-4/packages/calendar/tcl/cal-item-2-procs-postgresql.xql 4 Dec 2002 09:44:35 -0000 1.7 @@ -19,8 +19,8 @@ 0 as n_attachments, to_char(start_date, 'YYYY-MM-DD HH:MI:SS') as start_date, end_date as end_date, - to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as full_start_date, - to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as full_end_date, + to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_start_date, + to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_end_date, coalesce(a.name, e.name) as name, coalesce(e.description, a.description) as description, recurrence_id, @@ -56,8 +56,8 @@ to_char(start_date, 'MM/DD/YYYY') as pretty_short_start_date, to_char(end_date, 'HH:MIpm') as end_time, end_date as end_date, - to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as full_start_date, - to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as full_end_date, + to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_start_date, + to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_end_date, coalesce(a.name, e.name) as name, coalesce(e.description, a.description) as description, recurrence_id, Index: openacs-4/packages/calendar/tcl/cal-item-2-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/cal-item-2-procs.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/calendar/tcl/cal-item-2-procs.tcl 18 Nov 2002 18:01:10 -0000 1.6 +++ openacs-4/packages/calendar/tcl/cal-item-2-procs.tcl 4 Dec 2002 09:44:35 -0000 1.7 @@ -62,15 +62,16 @@ } db_1row $query_name {} -column_array row - - set row(start_time) [lc_time_fmt $row(full_start_date) "%X"] + + # Localize + set row(start_time) [lc_time_fmt $row(ansi_start_date) "%X"] # Unfortunately, SQL has weekday starting at 1 = Sunday - set row(day_of_week) [expr [lc_time_fmt $row(full_start_date) "%w"] + 1] - set row(pretty_day_of_week) [lc_time_fmt $row(full_start_date) "%A"] - set row(day_of_month) [lc_time_fmt $row(full_start_date) "%d"] - set row(pretty_short_start_date) [lc_time_fmt $row(full_start_date) "%x"] + set row(day_of_week) [expr [lc_time_fmt $row(ansi_start_date) "%w"] + 1] + set row(pretty_day_of_week) [lc_time_fmt $row(ansi_start_date) "%A"] + set row(day_of_month) [lc_time_fmt $row(ansi_start_date) "%d"] + set row(pretty_short_start_date) [lc_time_fmt $row(ansi_start_date) "%x"] - set row(end_time) [lc_time_fmt $row(full_end_date) "%X"] + set row(end_time) [lc_time_fmt $row(ansi_end_date) "%X"] } ad_proc -public add_recurrence { Index: openacs-4/packages/calendar/tcl/calendar-display-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/calendar-display-procs-oracle.xql,v diff -u -r1.12 -r1.13 --- openacs-4/packages/calendar/tcl/calendar-display-procs-oracle.xql 18 Nov 2002 18:01:10 -0000 1.12 +++ openacs-4/packages/calendar/tcl/calendar-display-procs-oracle.xql 4 Dec 2002 09:44:35 -0000 1.13 @@ -74,10 +74,7 @@ - select to_char(start_date, 'HH24') as start_hour, - to_char(start_date, 'HH24:MI') as start_date, - to_char(end_date, 'HH24:MI') as end_date, - to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_start_date, + select to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_start_date, to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as ansi_end_date, nvl(e.name, a.name) as name, nvl(e.status_summary, a.status_summary) as status_summary, @@ -86,7 +83,9 @@ on_which_calendar as calendar_id, (select calendar_name from calendars where calendar_id = on_which_calendar) - as calendar_name + as calendar_name, + to_char(timezone.local_to_utc(timezone.get_id(:timezone),to_date(:current_date,:date_format)),'YYYY-MM-DD HH24:MI:SS') as start_interval, + to_char(timezone.local_to_utc(timezone.get_id(:timezone),to_date(:current_date,:date_format) + (24 - 1/3600)/24),'YYYY-MM-DD HH24:MI:SS') as end_interval from acs_activities a, acs_events e, timespans s, @@ -96,8 +95,8 @@ and s.interval_id = t.interval_id and e.activity_id = a.activity_id and start_date between - to_date(:current_date,:date_format) and - to_date(:current_date,:date_format) + (24 - 1/3600)/24 + timezone.local_to_utc(timezone.get_id(:timezone),to_date(:current_date,:date_format)) and + timezone.local_to_utc(timezone.get_id(:timezone),to_date(:current_date,:date_format) + (24 - 1/3600)/24) and cal_items.cal_item_id= e.event_id and e.event_id in ( Index: openacs-4/packages/calendar/tcl/calendar-display-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/calendar-display-procs.tcl,v diff -u -r1.30 -r1.31 --- openacs-4/packages/calendar/tcl/calendar-display-procs.tcl 20 Nov 2002 17:25:33 -0000 1.30 +++ openacs-4/packages/calendar/tcl/calendar-display-procs.tcl 4 Dec 2002 09:44:35 -0000 1.31 @@ -46,6 +46,7 @@ db_foreach select_monthly_items {} { + # Localize set start_time [lc_time_fmt $ansi_start_date "%X"] set end_time [lc_time_fmt $ansi_end_date "%X"] @@ -152,6 +153,7 @@ # Loop through the calendars db_foreach select_week_items {} { + # Localize set pretty_start_date [lc_time_fmt $ansi_start_date "%X"] set pretty_end_date [lc_time_fmt $ansi_end_date "%X"] @@ -241,8 +243,16 @@ set items [ns_set create] + set timezone [lang::conn::timezone] + # Loop through the calendars db_foreach select_day_items {} { + # other date/time formats + set start_hour [lc_time_fmt $ansi_start_date "%H"] + set start_date [lc_time_fmt $ansi_start_date "%H:%M"] + set end_date [lc_time_fmt $ansi_end_date "%H:%M"] + + # Localize set pretty_start_date [lc_time_fmt $ansi_start_date "%X"] set pretty_end_date [lc_time_fmt $ansi_end_date "%X"] @@ -361,6 +371,7 @@ append item " ($calendar_name)" } + # Localize set pretty_date [lc_time_fmt $ansi_start_date "%x"] set pretty_weekday [lc_time_fmt $ansi_start_date "%A"] set pretty_start_date [lc_time_fmt $ansi_start_date "%X"] Index: openacs-4/packages/calendar/www/cal-item-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item-edit.tcl,v diff -u -r1.14 -r1.15 --- openacs-4/packages/calendar/www/cal-item-edit.tcl 18 Nov 2002 18:01:11 -0000 1.14 +++ openacs-4/packages/calendar/www/cal-item-edit.tcl 4 Dec 2002 09:44:44 -0000 1.15 @@ -91,8 +91,8 @@ element set_properties cal_item cal_item_id -value $cal_item(cal_item_id) element set_properties cal_item title -value $cal_item(name) element set_properties cal_item date -value [template::util::date::from_ansi $cal_item(start_date)] - element set_properties cal_item start_time -value [template::util::date::from_ansi $cal_item(full_start_date) [lc_get formbuilder_time_format]] - element set_properties cal_item end_time -value [template::util::date::from_ansi $cal_item(full_end_date) [lc_get formbuilder_time_format]] + element set_properties cal_item start_time -value [template::util::date::from_ansi $cal_item(ansi_start_date) [lc_get formbuilder_time_format]] + element set_properties cal_item end_time -value [template::util::date::from_ansi $cal_item(ansi_end_date) [lc_get formbuilder_time_format]] element set_properties cal_item description -value $cal_item(description) element set_properties cal_item item_type_id -value $cal_item(item_type_id)