Index: openacs-4/packages/calendar/tcl/calendar-2-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/calendar-2-procs.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/calendar/tcl/calendar-2-procs.tcl	26 Jul 2003 20:50:31 -0000	1.11
+++ openacs-4/packages/calendar/tcl/calendar-2-procs.tcl	12 Sep 2003 20:00:13 -0000	1.12
@@ -17,20 +17,22 @@
         @author Dirk Gomez (openacs@dirkgomez.de)
         @creation-date 20-July-2003
     } {
-        i18n_display_parameters
+        set first_day_of_week [lc_get firstdayofweek]
+        set last_day_of_week [expr [expr $first_day_of_week + 6] % 7]
+
         if {$current_day == $today_julian_date} {
             set today_p t 
         } else {
             set today_p f
         }
         set day_number [expr $current_day - $first_julian_date_of_month +1]
-        set weekday [expr $current_day % 7]
-        
+        set weekday [expr [expr $current_day % 7] +1]
+
         set beginning_of_week_p f
         set end_of_week_p f
-        if {$weekday == $week_ends_on} {
+        if {$weekday == $last_day_of_week} {
             set end_of_week_p t
-        } elseif {$weekday == $week_begins_on} {
+        } elseif {$weekday == $first_day_of_week} {
             set beginning_of_week_p t
         }
         return [list day_number $day_number \
@@ -39,35 +41,6 @@
                     end_of_week_p $end_of_week_p]
     }
 
-    ad_proc -public get_weekday_list {
-    } {
-        Return a list of the weekdays one letter each. You need to be wary
-        that your settings here coincide with other basic configuration
-        parameters.
-
-        Not-yet i18nized.
-        @author Dirk Gomez (openacs@dirkgomez.de)
-        @creation-date 20-July-2003
-    } {
-        # This will be retrieved from a apm_parameter or a user setting
-        return [list S M T W T F S]
-    }
-
-    ad_proc -public i18n_display_parameters {
-    } {
-        Basic parameters to make calendar displaying locale-dependent.
-
-        Not-yet i18nized.
-
-        @author Dirk Gomez (openacs@dirkgomez.de)
-        @creation-date 20-July-2003
-    } {
-        uplevel 1 {
-            set week_ends_on 5
-            set week_begins_on 6
-        }
-    }
-
     ad_proc -public from_sql_datetime {
         {-sql_date:required}
         {-format:required}
Index: openacs-4/packages/calendar/www/cal-options.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-options.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/calendar/www/cal-options.adp	12 Aug 2003 23:42:38 -0000	1.6
+++ openacs-4/packages/calendar/www/cal-options.adp	12 Sep 2003 20:00:13 -0000	1.7
@@ -1,6 +1,6 @@
 <if @calendars:rowcount@ gt 0>
 <p>
-Calendars:
+#calendar.Calendars#:
 <ul>
 <multiple name="calendars">
 <li> @calendars.calendar_name@
Index: openacs-4/packages/calendar/www/mini-calendar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/mini-calendar.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/www/mini-calendar.adp	21 Jul 2003 19:21:36 -0000	1.1
+++ openacs-4/packages/calendar/www/mini-calendar.adp	12 Sep 2003 20:00:13 -0000	1.2
@@ -26,7 +26,7 @@
       <img border=0 src="/shared/images/left.gif"></a>
       <td class="cal-month-title-text" colspan="2">@curr_year@</td>
       <td align="right" class="cal-month-title">
-      @prev_year_url;noquote@
+      @next_year_url;noquote@
       <img border=0 src="/shared/images/right.gif"></a>
     </if>
     <else>
@@ -127,17 +127,17 @@
   <font size=-2>
   
   <if @today_p@ eq t>
-    <b>Today</b>
+    <b>#acs_datetime.Today#</b>
   </if>
   <else>
     <a href="@today_url;noquote@">
-    <b>Today</b></a> 
+    <b>#acs_datetime.Today#</b></a> 
   </else>
   
-  is <%=[dt_ansi_to_pretty]%></font></td></tr>
+  #acs_datetime.is# <%=[dt_ansi_to_pretty]%></font></td></tr>
   <tr><td align=center><br>
   <form method=get action=@base_url@>
-  <INPUT TYPE=text name=date size=10> <INPUT type=image src="/shared/images/go.gif" alt="Go" border=0><br><font size=-2>Date as YYYYMMDD</font>
+  <INPUT TYPE=text name=date size=10> <INPUT type=image src="/shared/images/go.gif" alt="Go" border=0><br><font size=-2>#acs-datetime.Date_as_YYYYMMDD#</font>
   <INPUT TYPE=hidden name=view value=day>
   @form_vars;noquote@
   </form>
Index: openacs-4/packages/calendar/www/mini-calendar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/mini-calendar.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/calendar/www/mini-calendar.tcl	12 Sep 2003 10:01:30 -0000	1.4
+++ openacs-4/packages/calendar/www/mini-calendar.tcl	12 Sep 2003 20:00:13 -0000	1.5
@@ -27,20 +27,24 @@
     dt_get_info $date
 }
 
+set date_list [dt_ansi_to_list $date]
+set year [dt_trim_leading_zeros [lindex $date_list 0]]
+set month [dt_trim_leading_zeros [lindex $date_list 1]]
+set day [dt_trim_leading_zeros [lindex $date_list 2]]
 
 set now        [clock scan $date]
 set output ""
 
+set months_list [dt_month_names]
+set curr_month_idx  [expr [dt_trim_leading_zeros [clock format $now -format "%m"]]-1]
 if [string equal $view month] {
     set curr_year [clock format $now -format "%Y"]
     set prev_year [clock format [clock scan "1 year ago" -base $now] -format "%Y-%m-%d"]
     set next_year [clock format [clock scan "1 year" -base $now] -format "%Y-%m-%d"]
     set prev_year_url "<a href=\"$base_url?view=$view&date=[ad_urlencode $prev_year]\">"
     set next_year_url "<a href=\"$base_url?view=$view&date=[ad_urlencode $next_year]\">"
 
-    set months_list [dt_month_names]
     set now         [clock scan $date]
-    set curr_month  [expr [dt_trim_leading_zeros [clock format $now -format "%m"]]-1]
 
     multirow create months name current_month_p new_row_p target_date
 
@@ -56,37 +60,49 @@
             set new_row_p f
         }
 
-        if {$i == $curr_month} {
+        if {$i == $curr_month_idx} {
             set current_month_p t 
             set encoded_target_date ""
         } else {
             set current_month_p f
             set target_date [clock format \
-                                 [clock scan "[expr $i-$curr_month] month" -base $now] -format "%Y-%m-%d"]
+                                 [clock scan "[expr $i-$curr_month_idx] month" -base $now] -format "%Y-%m-%d"]
             set encoded_target_date [ad_urlencode $target_date]
         }
         multirow append months $month $current_month_p $new_row_p $encoded_target_date
         
     }
 } else {
-    set curr_month [clock format $now -format "%B"]
+    set curr_month [lindex $months_list $curr_month_idx ]
     set prev_month [clock format [clock scan "1 month ago" -base $now] -format "%Y-%m-%d"]
     set next_month [clock format [clock scan "1 month" -base $now] -format "%Y-%m-%d"]
     set prev_month_url "<a href=\"$base_url?view=$view&date=[ad_urlencode $prev_month]\">"
     set next_month_url "<a href=\"$base_url?view=$view&date=[ad_urlencode $next_month]\">"
     
+    set first_day_of_week [lc_get firstdayofweek]
+    set week_days [lc_get abday]
     multirow create days_of_week day_short
-    # I18N !
-    foreach day_of_week [list S M T W T F S] {
-        multirow append days_of_week $day_of_week
+    for {set i 0} {$i < 7} {incr i} {
+        multirow append days_of_week [lindex $week_days [expr [expr $i + $first_day_of_week] % 7]]
     }
 
-    set day_of_week 1
-    set day_number  $first_day
 
     multirow create days day_number ansi_date beginning_of_week_p end_of_week_p today_p greyed_p
 
-    for {set julian_date $first_julian_date} {$julian_date <= $last_julian_date} {incr julian_date} {
+    set day_of_week 1
+
+    # Calculate number of greyed days
+    set greyed_days_before_month [expr [expr [dt_first_day_of_month $year $month]] -1 ]
+    # Adjust for i18n
+    set greyed_days_before_month [expr [expr $greyed_days_before_month + 7 - $first_day_of_week] % 7]
+
+    set calendar_starts_with_julian_date [expr $first_julian_date_of_month - $greyed_days_before_month]
+    set day_number [expr $days_in_last_month - $greyed_days_before_month + 1]
+
+    for {set julian_date $calendar_starts_with_julian_date} {$julian_date <= [expr $last_julian_date + 7]} {incr julian_date} {
+        if {$julian_date > $last_julian_date_in_month && [string equal $end_of_week_p t] } {
+            break
+        }
         set today_p f
         set greyed_p f
 
@@ -103,25 +119,25 @@
             set day_number 1
         }
 
-        if { $day_of_week == 1} {
+        if {$julian_date == $julian_date_today} {
+            set today_p t
+        }
+
+        if { $day_of_week == 0} {
             set beginning_of_week_p t
         } else {
             set beginning_of_week_p f
         }
 
-        if {$julian_date == $julian_date_today} {
-            set today_p t
-        }
-
         if { $day_of_week == 7 } {
             set day_of_week 0
             set end_of_week_p t
         } else {
             set end_of_week_p f
         }
         multirow append days $day_number [ad_urlencode $ansi_date] $beginning_of_week_p $end_of_week_p $today_p $greyed_p
-        incr day_of_week
         incr day_number
+        incr day_of_week
     }
 }
 
Index: openacs-4/packages/calendar/www/view-list-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-list-display.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/calendar/www/view-list-display.adp	9 Sep 2003 09:12:54 -0000	1.4
+++ openacs-4/packages/calendar/www/view-list-display.adp	12 Sep 2003 20:00:13 -0000	1.5
@@ -16,11 +16,11 @@
 
 <table class="table-display" border=0 cellspacing=0 cellpadding=2>
   <tr class="table-header">
-  <th align=left>Day of Week</th>
-  <th align="center"><a href="@start_date_url@">Start Date</a></th>
-  <th align="center">Start Time</th>
-  <th align="center">End Time</th>
-  <th align="center"><a href="@item_type_url@">Type</a></th>
+  <th align=left>#acs-datetime.Day_of_Week#</th>
+  <th align="center"><a href="@start_date_url@">#calendar.Date_1#</a></th>
+  <th align="center">#calendar.Start_Time#</th>
+  <th align="center">#calendar.End_Time#</th>
+  <th align="center"><a href="@item_type_url@">#calendar.Type_1#</a></th>
   <th align=left>Title</th></tr>
 
 <multiple name="calendar_items">
Index: openacs-4/packages/calendar/www/view-list-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-list-display.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/calendar/www/view-list-display.tcl	9 Sep 2003 09:12:54 -0000	1.8
+++ openacs-4/packages/calendar/www/view-list-display.tcl	12 Sep 2003 20:00:13 -0000	1.9
@@ -35,15 +35,15 @@
 }
 
 if {[empty_string_p $start_date] && ![empty_string_p $end_date]} {
-    set title "Items until [util_AnsiDatetoPrettyDate $end_date]"
+    set title "[_ acs-datetime.to] [util_AnsiDatetoPrettyDate $end_date]"
 }
 
 if {![empty_string_p $start_date] && [empty_string_p $end_date]} {
-    set title "Items starting [util_AnsiDatetoPrettyDate $start_date]"
+    set title "[_ acs-datetime.Items_from] [util_AnsiDatetoPrettyDate $start_date]"
 }
 
 if {![empty_string_p $start_date] && ![empty_string_p $end_date]} {
-    set title "Items from [util_AnsiDatetoPrettyDate $start_date] to [util_AnsiDatetoPrettyDate $end_date]"
+    set title "[_ acs-datetime.Items_from] [util_AnsiDatetoPrettyDate $start_date] [_ acs-datetime.to] [util_AnsiDatetoPrettyDate $end_date]"
 }
 
 set today_date [dt_sysdate]    
Index: openacs-4/packages/calendar/www/view-month-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-month-display.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/calendar/www/view-month-display.adp	29 Aug 2003 20:46:43 -0000	1.3
+++ openacs-4/packages/calendar/www/view-month-display.adp	12 Sep 2003 20:00:13 -0000	1.4
@@ -7,7 +7,7 @@
   @prev_month_url;noquote@
   <img src="/shared/images/left.gif" alt="back one month" border="0">
   </a>
-  <b>@month@ @year@</b>
+  <b>@month_string@ @year@</b>
   @next_month_url;noquote@
   <img src="/shared/images/right.gif" alt="forward one month" border="0"
   </a>
Index: openacs-4/packages/calendar/www/view-month-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-month-display.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/calendar/www/view-month-display.tcl	29 Aug 2003 20:46:43 -0000	1.5
+++ openacs-4/packages/calendar/www/view-month-display.tcl	12 Sep 2003 20:00:13 -0000	1.6
@@ -23,11 +23,39 @@
 if { ![info exists item_template] } {
     set item_template "<a href=cal-item-view?cal_item_id=\$item_id>\$item</a>"
 }
+
+# NEW
+if { ![info exists show_calendar_name_p] } {
+    set show_calendar_name_p 1
+}
+
+if {[exists_and_not_null $calendar_id_list]} {
+    set calendars_clause "and on_which_calendar in ([join $calendar_id_list ","]) and (cals.private_p='f' or (cals.private_p='t' and cals.owner_id= :user_id))"
+} else {
+    set calendars_clause "and (cals.package_id= :package_id or (cals.private_p='f' or (cals.private_p='t' and cals.owner_id= :user_id)))"
+}
+
+if { ![info exists prev_month_template] } {
+    set prev_month_template ""
+}
+
+if { ![info exists next_month_template] } {
+    set next_month_template ""
+}
+
+if { ![info exists item_add_template] } {
+    set item_add_template ""
+}
 # calendar-portlet
 
 
 dt_get_info $date
+set date_list [dt_ansi_to_list $date]
+set this_year [dt_trim_leading_zeros [lindex $date_list 0]]
+set this_month [dt_trim_leading_zeros [lindex $date_list 1]]
+set this_day [dt_trim_leading_zeros [lindex $date_list 2]]
 
+set month_string [lindex [dt_month_names] [expr $this_month - 1]]
 set ansi_date_format "YYYY-MM-DD HH24:MI:SS"
 
 set package_id [ad_conn package_id]
@@ -36,19 +64,23 @@
 set next_month_url "<a href=\"view?calendar_list=&view=month&date=[ad_urlencode $next_month]\">"
 set prev_month_url "<a href=\"view?calendar_list=&view=month&date=[ad_urlencode $prev_month]\">"
 
+set first_day_of_week [lc_get firstdayofweek]
+set last_day_of_week [expr [expr $first_day_of_week + 7] % 7]
+
+
+set week_days [lc_get abday]
 multirow create weekday_names weekday_short
-foreach weekday [calendar::get_weekday_list] {
-    multirow append weekday_names $weekday
+for {set i 0} {$i < 7} {incr i} {
+    multirow append weekday_names [lindex $week_days [expr [expr $i + $first_day_of_week] % 7]]
 }
 
+
 # Get the beginning and end of the month in the system timezone
 set first_date_of_month [dt_julian_to_ansi $first_julian_date_of_month]
 set first_date_of_month_system [lc_time_conn_to_system "$first_date_of_month 00:00:00"]
 set last_date_in_month [dt_julian_to_ansi $last_julian_date_in_month]
 set last_date_in_month_system [lc_time_conn_to_system "$last_date_in_month 23:59:59"]
 
-calendar::i18n_display_parameters
-
 set number_day_cells 0
 
 set day_number $first_day
@@ -59,8 +91,14 @@
 
 multirow create days_of_a_month calendar_item item_id ansi_start_date ansi_start_time day_number calendar_name beginning_of_week_p end_of_week_p today_p outside_month_p full_item
 
-for {set current_day $first_julian_date} {$current_day < $first_julian_date_of_month} {incr current_day} {
-    if {$current_day == $first_julian_date} {
+
+# Calculate number of greyed days
+set greyed_days_before_month [expr [expr [dt_first_day_of_month $this_year $this_month]] -1 ]
+# Adjust for i18n
+set greyed_days_before_month [expr [expr $greyed_days_before_month + 7 - $first_day_of_week] % 7]
+
+for {set current_day 0} {$current_day < $greyed_days_before_month} {incr current_day} {
+    if {$current_day == 0} {
         set beginning_of_week_p t
     } else {
         set beginning_of_week_p f
@@ -119,9 +157,9 @@
     incr number_day_cells
 }
 
-set remaining_days [expr 6 - $current_day % 7] 
+set remaining_days [expr [expr $first_day_of_week + 6 - $current_day % 7] % 7]
 
-if {$remaining_days > 0 } {
+if {$remaining_days > 0} {
     for {} {$current_day <= [expr $last_julian_date_in_month + $remaining_days]} {incr current_day} {
         multirow append days_of_a_month "" "" "" "" "" "" f f "" t ""
     }
Index: openacs-4/packages/calendar/www/view-one-day-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-one-day-display.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/calendar/www/view-one-day-display.tcl	9 Sep 2003 09:10:25 -0000	1.15
+++ openacs-4/packages/calendar/www/view-one-day-display.tcl	12 Sep 2003 20:00:13 -0000	1.16
@@ -212,7 +212,7 @@
     }
 }
 
-set dates "[util_AnsiDatetoPrettyDate $date]"
+set dates [lc_time_fmt $date "%q"]
 set ansi_list [split $date "- "]
 set ansi_year [lindex $ansi_list 0]
 set ansi_month [string trimleft [lindex $ansi_list 1] "0"]
Index: openacs-4/packages/calendar/www/view-week-display-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-week-display-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/calendar/www/view-week-display-postgresql.xql	14 Aug 2003 15:44:08 -0000	1.4
+++ openacs-4/packages/calendar/www/view-week-display-postgresql.xql	12 Sep 2003 20:00:13 -0000	1.5
@@ -7,10 +7,10 @@
 <querytext>
         select   to_char(to_date(:start_date, 'YYYY-MM-DD'), 'D') 
         as       day_of_the_week,
-        to_char(next_day(to_date(:start_date, 'YYYY-MM-DD')- '1 week'::interval, 'Sunday'), 'YYYY-MM-DD')
-        as       sunday_of_the_week,
-        to_char(next_day(to_date(:start_date, 'YYYY-MM-DD'), 'Saturday'), 'YYYY-MM-DD')
-        as       saturday_of_the_week
+        to_char(next_day(to_date(:start_date, 'YYYY-MM-DD')- '1 week'::interval, :first_us_weekday), 'YYYY-MM-DD')
+        as       first_weekday_of_the_week,
+        to_char(next_day(to_date(:start_date, 'YYYY-MM-DD'), :last_us_weekday), 'YYYY-MM-DD')
+        as       last_weekday_of_the_week
         from     dual
 </querytext>
 </fullquery>
@@ -35,8 +35,8 @@
 and      s.interval_id = t.interval_id
 and      e.activity_id = a.activity_id
 and      start_date between
-         to_date(:sunday_of_the_week_system, :ansi_date_format) and
-         to_date(:saturday_of_the_week_system, :ansi_date_format)
+         to_date(:first_weekday_of_the_week_system, :ansi_date_format) and
+         to_date(:last_weekday_of_the_week_system, :ansi_date_format)
 and      cals.package_id= :package_id
 and      (cals.private_p='f' or (cals.private_p='t' and cals.owner_id= :user_id))
 and      cals.calendar_id = ci.on_which_calendar
@@ -49,34 +49,14 @@
 <querytext>
 select   to_char(to_date(:start_date, 'YYYY-MM-DD'), 'D') 
 as day_of_the_week,
-cast(next_day(to_date(:start_date, 'YYYY-MM-DD') - cast('7 days' as interval), 'Sunday') as date)
-as sunday_date,
-to_char(next_day(to_date(:start_date, 'YYYY-MM-DD') - cast('7 days' as interval), 'Sunday'),'J') 
-as sunday_julian,
-cast(next_day(to_date(:start_date, 'YYYY-MM-DD') - cast('7 days' as interval), 'Sunday') + cast('1 day' as interval) as date)
-as monday_date,
-to_char(next_day(to_date(:start_date, 'YYYY-MM-DD') - cast('7 days' as interval), 'Sunday') + cast('1 day' as interval),'J')
-as monday_julian,
-cast(next_day(to_date(:start_date, 'YYYY-MM-DD') - cast('7 days' as interval), 'Sunday') + cast('2 days' as interval) as date)
-as tuesday_date,
-to_char(next_day(to_date(:start_date, 'YYYY-MM-DD') - cast('7 days' as interval), 'Sunday') + cast('2 days' as interval),'J') 
-as tuesday_julian,
-cast(next_day(to_date(:start_date, 'YYYY-MM-DD') - cast('7 days' as interval), 'Sunday') + cast('3 days' as interval) as date)
-as wednesday_date,
-to_char(next_day(to_date(:start_date, 'YYYY-MM-DD') - cast('7 days' as interval), 'Sunday') + cast('3 days' as interval),'J') 
-as wednesday_julian,
-cast(next_day(to_date(:start_date, 'YYYY-MM-DD') - cast('7 days' as interval), 'Sunday') + cast('4 days' as interval) as date)
-as thursday_date,
-to_char(next_day(to_date(:start_date, 'YYYY-MM-DD') - cast('7 days' as interval), 'Sunday') + cast('4 days' as interval),'J') 
-as thursday_julian,
-cast(next_day(to_date(:start_date, 'YYYY-MM-DD') - cast('7 days' as interval), 'Sunday') + cast('5 days' as interval) as date)
-as friday_date,
-to_char(next_day(to_date(:start_date, 'YYYY-MM-DD') - cast('7 days' as interval), 'Sunday') + cast('5 days' as interval),'J') 
-as friday_julian,
-cast(next_day(to_date(:start_date, 'YYYY-MM-DD') - cast('7 days' as interval), 'Sunday') + cast('6 days' as interval) as date)
-as saturday_date,
-to_char(next_day(to_date(:start_date, 'YYYY-MM-DD') - cast('7 days' as interval), 'Sunday') + cast('6 days' as interval),'J') 
-as saturday_julian,
+cast(next_day(to_date(:start_date, 'YYYY-MM-DD') - cast('7 days' as interval), :first_us_weekday) as date)
+as first_weekday_date,
+to_char(next_day(to_date(:start_date, 'YYYY-MM-DD') - cast('7 days' as interval), :first_us_weekday),'J') 
+as first_weekday_julian,
+cast(next_day(to_date(:start_date, 'YYYY-MM-DD') - cast('7 days' as interval), :first_us_weekday) + cast('6 days' as interval) as date)
+as last_weekday_date,
+to_char(next_day(to_date(:start_date, 'YYYY-MM-DD') - cast('7 days' as interval), :first_us_weekday) + cast('6 days' as interval),'J') 
+as last_weekday_julian,
 cast(:start_date::timestamptz - cast('7 days' as interval) as date) as last_week,
 to_char(:start_date::timestamptz - cast('7 days' as interval), 'Month DD, YYYY') as last_week_pretty,
 cast(:start_date::timestamptz + cast('7 days' as interval) as date) as next_week,
Index: openacs-4/packages/calendar/www/view-week-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-week-display.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/calendar/www/view-week-display.tcl	29 Aug 2003 20:46:43 -0000	1.7
+++ openacs-4/packages/calendar/www/view-week-display.tcl	12 Sep 2003 20:00:13 -0000	1.8
@@ -17,6 +17,33 @@
 if { ![info exists item_template] } {
     set item_template "<a href=cal-item-view?cal_item_id=\$item_id>\$item</a>"
 }
+
+# NEW
+if { ![info exists show_calendar_name_p] } {
+    set show_calendar_name_p 1
+}
+
+if { ![info exists prev_week_template] } {
+    set prev_week_template ""
+}
+
+if { ![info exists next_week_template] } {
+    set next_week_template ""
+}
+
+if { ![info exists url_stub_callback] } {
+    set url_stub_callback ""
+}
+
+if {[exists_and_not_null $calendar_id_list]} {
+    set calendars_clause "and on_which_calendar in ([join $calendar_id_list ","]) and (cals.private_p='f' or (cals.private_p='t' and cals.owner_id= :user_id))"
+} else {
+    set calendars_clause "and (cals.package_id= :package_id or (cals.private_p='f' or (cals.private_p='t' and cals.owner_id= :user_id)))"
+}
+
+if { ![info exists item_add_template] } {
+    set item_add_template ""
+}
 # calendar-portlet
 
 
@@ -34,34 +61,30 @@
 
 set start_date $date
 
-# If we were given no calendars, we assume we display the 
-# private calendar. It makes no sense for this to be called with
-# no data whatsoever.
-if {[empty_string_p $calendar_id_list]} {
-    set calendar_id_list [list [calendar_have_private_p -return_id 1 [ad_get_user_id]]]
-}
-
 # Convert date from user timezone to system timezone
 #set system_start_date [lc_time_conn_to_system "$date 00:00:00"]
 
+set first_day_of_week [lc_get firstdayofweek]
+set first_us_weekday [lindex [lc_get -locale en_US day] $first_day_of_week]
+set last_us_weekday [lindex [lc_get -locale en_US day] [expr [expr $first_day_of_week + 6] % 7]]
+
 db_1row select_weekday_info {}
 db_1row select_week_info {}
     
 set current_weekday 0
 
-# Loop through the calendars
 multirow create week_items name item_id start_date calendar_name status_summary day_of_week start_date_weekday start_time end_time no_time_p full_item
 
 # Convert date from user timezone to system timezone
-set sunday_of_the_week_system [lc_time_conn_to_system "$sunday_of_the_week 00:00:00"]
-set saturday_of_the_week_system [lc_time_conn_to_system "$saturday_of_the_week 00:00:00"]
+set first_weekday_of_the_week_system [lc_time_conn_to_system "$first_weekday_of_the_week 00:00:00"]
+set last_weekday_of_the_week_system [lc_time_conn_to_system "$last_weekday_of_the_week 00:00:00"]
 
 db_foreach select_week_items {} {
     # Convert from system timezone to user timezone
     set ansi_start_date [lc_time_system_to_conn $ansi_start_date]
     set ansi_end_date [lc_time_system_to_conn $ansi_end_date]
 
-    set day_of_week [lc_time_fmt $ansi_start_date "%f"]
+    set day_of_week [expr [lc_time_fmt $ansi_start_date "%f"] - $first_day_of_week]
     set start_date_weekday [lc_time_fmt $ansi_start_date "%A"]
 
     set start_date [lc_time_fmt $ansi_start_date "%x"]
@@ -70,12 +93,10 @@
     set start_time [lc_time_fmt $ansi_start_date "%X"]
     set end_time [lc_time_fmt $ansi_end_date "%X"]
 
-    if {$day_of_week > $current_weekday} {
-        # need to add dummy entries to show all days
-        for {  } { $current_weekday < $day_of_week } { incr current_weekday } {
-	    set ansi_this_date [dt_julian_to_ansi [expr $sunday_julian + $current_weekday]]
-            multirow append week_items "" "" [lc_time_fmt $ansi_this_date "%x"] "" "" $current_weekday [lc_time_fmt $ansi_this_date %A] "" "" "" ""
-        }
+    # need to add dummy entries to show all days
+    for {  } { $current_weekday < $day_of_week } { incr current_weekday } {
+        set ansi_this_date [dt_julian_to_ansi [expr $first_weekday_julian + $current_weekday]]
+        multirow append week_items "" "" [lc_time_fmt $ansi_this_date "%x"] "" "" $current_weekday [lc_time_fmt $ansi_this_date %A] "" "" "" ""
     }
 
     if {[string equal $start_time "12:00 AM"] && [string equal $end_time "12:00 AM"]} {
@@ -104,12 +125,12 @@
 if {$current_weekday < 7} {
     # need to add dummy entries to show all hours
     for {  } { $current_weekday < 7 } { incr current_weekday } {
-	set ansi_this_date [dt_julian_to_ansi [expr $sunday_julian + $current_weekday]]
+	set ansi_this_date [dt_julian_to_ansi [expr $first_weekday_julian + $current_weekday]]
 	multirow append week_items "" "" [lc_time_fmt $ansi_this_date "%x"] "" "" $current_weekday [lc_time_fmt $ansi_this_date %A] "" "" "" ""
     }
 }
 
 # Navigation Bar
-set dates "[util_AnsiDatetoPrettyDate $sunday_date] - [util_AnsiDatetoPrettyDate $saturday_date]"
-set url_previous_week "<a href=\"view?calendar_list=&view=week&date=[ad_urlencode [dt_julian_to_ansi [expr $sunday_julian - 7]]]\">"
-set url_next_week "<a href=\"view?calendar_list=&view=week&date=[ad_urlencode [dt_julian_to_ansi [expr $sunday_julian + 7]]]\">"
+set dates "[lc_time_fmt $first_weekday_date "%q"] - [lc_time_fmt $last_weekday_date "%q"]"
+set url_previous_week "<a href=\"view?calendar_list=&view=week&date=[ad_urlencode [dt_julian_to_ansi [expr $first_weekday_julian - 7]]]\">"
+set url_next_week "<a href=\"view?calendar_list=&view=week&date=[ad_urlencode [dt_julian_to_ansi [expr $first_weekday_julian + 7]]]\">"