sharpetronics/callirhoe
1
0
Fork 0
mirror of https://github.com/oDinZu/callirhoe.git synced 2025-02-22 00:04:52 -05:00
Code Issues Projects Releases Wiki Activity

holiday fixes

Browse Source 
git-svn-id: https://callirhoe.googlecode.com/svn/trunk@94 81c8bb96-aa45-f2e2-0eef-c4fa4a15c6df
This commit is contained in:
geortz@gmail.com 2014-09-09 21:08:07 +00:00
parent ff81c66ee9
commit 22eaf9c251
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
holidays/french_holidays_zone_A.FR.dat
View File

@ -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

2
holidays/french_holidays_zone_B.FR.dat
View File

@ -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

2
holidays/french_holidays_zone_C.FR.dat
View File

@ -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

9
layouts/sparse.py
View File

@ -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)