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.22 -r1.22.2.1
--- openacs-4/packages/calendar/www/mini-calendar.adp	30 Aug 2008 19:51:23 -0000	1.22
+++ openacs-4/packages/calendar/www/mini-calendar.adp	21 Jul 2009 22:00:44 -0000	1.22.2.1
@@ -2,12 +2,12 @@
   <caption>
     <if @view@ eq "month">
       <a href="@prev_year_url@" title="#calendar.prev_year#"><img src="/resources/calendar/images/left.gif" alt="#calendar.prev_year#"></a>
-      @curr_month@ @curr_day@ @curr_year@
+      @curr_date_pretty@
       <a href="@next_year_url@" title="#calendar.next_year#"><img src="/resources/calendar/images/right.gif" alt="#calendar.next_year#" ></a>
     </if>
     <else>
       <a href="@prev_month_url@#calendar" title="#calendar.prev_month#"><img src="/resources/calendar/images/left.gif" alt="#calendar.prev_month#" ></a>
-      @curr_month@ @curr_day@ @curr_year@
+      @curr_date_pretty@
       <a href="@next_month_url@#calendar" title="#calendar.next_month#"><img src="/resources/calendar/images/right.gif" alt="#calendar.next_month#" ></a>
     </else>
   </caption>
@@ -75,7 +75,7 @@
   <else>
     <a href="@today_url@" title="#calendar.goto_today#">#acs-datetime.Today#</a> 
   </else>
-  #acs-datetime.is# <%=[dt_ansi_to_pretty]%>
+  #acs-datetime.is# @today@
   </p>
 
   <formtemplate id="go-to-date"></formtemplate>
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.19 -r1.19.2.1
--- openacs-4/packages/calendar/www/mini-calendar.tcl	30 Aug 2008 19:51:23 -0000	1.19
+++ openacs-4/packages/calendar/www/mini-calendar.tcl	21 Jul 2009 22:00:44 -0000	1.19.2.1
@@ -4,7 +4,7 @@
 
 if {![exists_and_not_null date]} {
     set date [dt_sysdate]
-} 
+}
 
 ad_form -name go-to-date -method get -has_submit 1 -action $base_url  -export [lappend list_of_vars page_num] -html {class inline-form} -form {
     {date:text,nospell,optional
@@ -15,10 +15,9 @@
         {label "[_ calendar.Go_to_date]"}
     } 
     {view:text(hidden)
-        {label ""}
         {value "day"}
     }
-} -on_submit { }
+} -on_submit {}
 
 
 if {[exists_and_not_null page_num]} {
@@ -75,16 +74,20 @@
 }
 
 set now        [clock scan $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 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 months_list [dt_month_names]
 set curr_month_idx  [expr [dt_trim_leading_zeros [clock format $now -format "%m"]]-1]
 set curr_day [clock format $now -format "%d"]
 set curr_month [clock format $now -format "%B"]
 set curr_year [clock format $now -format "%Y"]
+set curr_date_pretty [lc_time_fmt $date "%q"]
+
+set today [lc_time_fmt [dt_sysdate] "%q"]
+
 if [string equal $view month] {
     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"]