diff --git a/holidays/french_holidays_zone_A.FR.dat b/holidays/french_holidays_zone_A.FR.dat index 3f40f88..4b85963 100644 --- a/holidays/french_holidays_zone_A.FR.dat +++ b/holidays/french_holidays_zone_A.FR.dat @@ -14,7 +14,7 @@ # flags = {off, multi} d|20130223-20130310|vacances d'hiver||multi -d|20130420-20140505|vacances de printemps||multi +d|20130420-20130505|vacances de printemps||multi d|20140301-20140316|vacances d'hiver||multi d|20140426-20140511|vacances de printemps||multi diff --git a/holidays/french_holidays_zone_B.FR.dat b/holidays/french_holidays_zone_B.FR.dat index a846453..5614a54 100644 --- a/holidays/french_holidays_zone_B.FR.dat +++ b/holidays/french_holidays_zone_B.FR.dat @@ -14,7 +14,7 @@ # flags = {off, multi} d|20130216-20130303|vacances d'hiver||multi -d|20130413-20140428|vacances de printemps||multi +d|20130413-20130428|vacances de printemps||multi d|20140222-20140309|vacances d'hiver||multi d|20140419-20140504|vacances de printemps||multi diff --git a/holidays/french_holidays_zone_C.FR.dat b/holidays/french_holidays_zone_C.FR.dat index 01d2931..f496a20 100644 --- a/holidays/french_holidays_zone_C.FR.dat +++ b/holidays/french_holidays_zone_C.FR.dat @@ -14,7 +14,7 @@ # flags = {off, multi} d|20130302-20130317|vacances d'hiver||multi -d|20130427-20140512|vacances de printemps||multi +d|20130427-20130512|vacances de printemps||multi d|20140215-20140302|vacances d'hiver||multi d|20140412-20140427|vacances de printemps||multi diff --git a/layouts/sparse.py b/layouts/sparse.py index f539ac1..0b9c75d 100644 --- a/layouts/sparse.py +++ b/layouts/sparse.py @@ -120,7 +120,7 @@ def _draw_day_cell(cr, rect, day, header, footer, theme, show_day_name, text_hei font = ds.header_font, measure = "W88") if header: - draw_str(cr, text = header, rect = Rright_header, scaling = -1, + draw_str(cr, text = header, rect = Rright_header, scaling = -1, stroke_rgba = ds.header, align = (1,1), font = ds.header_font, measure='MgMgMgMgMgMgMgMgMg') if footer: @@ -159,13 +159,8 @@ class CalendarRenderer(_base.CalendarRenderer): day_style = holiday_tuple[2] header = holiday_tuple[0] footer = holiday_tuple[1] - if footer: - if header: - header = "%s, %s" % (header, footer) - else: - header = footer _draw_day_cell(cr, rect = R, day = (year, month, dom, day), - header = header, footer = None, + header = header, footer = footer, theme = (day_style, G.dom, L), show_day_name = True, text_height = text_height)