Finish template update for year-of-day (aka "ordinal")
Extend template to take week-of-year as well.