From 3d5b269b3d16584112a3e906fc70fd074067cbda Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Sun, 18 Jan 2015 09:32:14 -0800 Subject: [PATCH] fix rendering of week 52 heading in weekly reports --- hledger-lib/Hledger/Data/Dates.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hledger-lib/Hledger/Data/Dates.hs b/hledger-lib/Hledger/Data/Dates.hs index b1fbe759c..d905a4a06 100644 --- a/hledger-lib/Hledger/Data/Dates.hs +++ b/hledger-lib/Hledger/Data/Dates.hs @@ -114,7 +114,7 @@ showDateSpan ds@(DateSpan (Just from) (Just to)) = -- _ | let ((fy,fw,fd), (ty,tw,td)) = (toWeekDate from, toWeekDate to) in fy==ty && fw+1==tw && fd==1 && td==1 -- -> formatTime defaultTimeLocale "%0f%gw%V" from -- YYYY/MM/DDwN ("week N, starting on YYYY/MM/DD") - _ | let ((fy,fw,fd), (ty,tw,td)) = (toWeekDate from, toWeekDate to) in fy==ty && fw+1==tw && fd==1 && td==1 + _ | let ((fy,fw,fd), (ty,tw,td)) = (toWeekDate from, toWeekDate (addDays (-1) to)) in fy==ty && fw==tw && fd==1 && td==7 -> formatTime defaultTimeLocale "%0C%y/%m/%dw%V" from -- a day, YYYY/MM/DDd (d suffix is to distinguish from a regular date in register) ((fy,fm,fd), (ty,tm,td)) | fy==ty && fm==tm && fd+1==td -> formatTime defaultTimeLocale "%0C%y/%m/%dd" from