updated to support RDATE end times or durations. Note that if you have two

2000-09-29  Damon Chaplin  <damon@helixcode.com>

	* cal-util/cal-recur.c: updated to support RDATE end times or
	durations. Note that if you have two RDATEs with the same start times,
	but with different end dates/durations set, the results are
	unpredictable. So the event editor dialog should check for this.

	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
	make strftime() strings translatable, and changed the formats a bit.

	* NOTE: someone needs to check print.c to make sure strftime strings
	are OK for i18n.

	* gui/e-day-view.h: Changed EDayViewDateFormat enum. We now try to
	include the weekday if possible. Also changed EDayView struct so we
	store the month & weekdays with the longest names rather than the
	actual widths. This helps i18n.

	* gui/e-day-view.c (e_day_view_recalc_cell_sizes): used _() for
	strftime strings, tried to see if weekday fits, and rearranged a
	bit to make i18n easier.

	* gui/e-day-view-top-item.c (e_day_view_top_item_draw): used _() for
	strftime strings, and updated to use new formats.

	* gui/calendar-model.c: added use_24_hour_format boolean to
	CalendarModelPrivate so we can display dates in 12-hour format if
	requested. This meant adding a CalendarModel argument to a few
	functions. Also added get/set functions to set use_24_hour_format.
	I suppose ideally we should have an ECellDate renderer and this option
	should go there.

svn path=/trunk/; revision=5646

1 files changed, 14 insertions, 4 deletions

diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index b6b8a565b5..6b00f34a60 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -183,7 +183,7 @@ e_day_view_top_item_draw (GnomeCanvasItem *canvas_item,
 	EDayView *day_view;
 	GtkStyle *style;
 	GdkGC *fg_gc, *bg_gc, *light_gc, *dark_gc;
-	gchar buffer[128];
+	gchar buffer[128], *format;
 	GdkRectangle clip_rect;
 	GdkFont *font;
 	gint canvas_width, canvas_height, left_edge, day, date_width, date_x;
@@ -256,12 +256,22 @@ e_day_view_top_item_draw (GnomeCanvasItem *canvas_item,
 		day_start = localtime (&day_view->day_starts[day]);
 
 		if (day_view->date_format == E_DAY_VIEW_DATE_FULL)
-			strftime (buffer, 128, "%d %B", day_start);
+			/* strftime format %A = full weekday name, %d = day of month,
+			   %B = full month name. Don't use any other specifiers. */
+			format = _("%A %d %B");
 		else if (day_view->date_format == E_DAY_VIEW_DATE_ABBREVIATED)
-			strftime (buffer, 128, "%d %b", day_start);
+			/* strftime format %a = abbreviated weekday name, %d = day of month,
+			   %b = abbreviated month name. Don't use any other specifiers. */
+			format = _("%a %d %b");
+		else if (day_view->date_format == E_DAY_VIEW_DATE_NO_WEEKDAY)
+			/* strftime format %d = day of month, %b = abbreviated month name.
+			   Don't use any other specifiers. */
+			format = _("%d %b");
 		else
-			strftime (buffer, 128, "%d", day_start);
+			format = "%d";
 
+		strftime (buffer, sizeof (buffer), format, day_start);
+			
 		clip_rect.x = day_view->day_offsets[day] - x;
 		clip_rect.y = 2 - y;
 		clip_rect.width = day_view->day_widths[day];