i18n

- Added Canadian holiday file
- Added Canadian holiday file to Makefile
- Fixed errors in 2011 US calendar

Makefile.am

@@ -20,5 +20,5 @@ i18ndir = $(docdir)
 nobase_dist_i18n_DATA = i18n/strings.de-DE i18n/strings.en-US i18n/strings.es-ES i18n/strings.fr-FR i18n/strings.nl-NL i18n/strings.sv-SE i18n/tips.de-DE i18n/tips.en-US i18n/tips.sv-SE
 
 rcfiledir = $(docdir)/rc
-dist_rcfile_DATA = doc/rc/holidays-US.rc doc/rc/holidays-SE.rc doc/rc/holidays-DE.rc doc/rc/holidays-FR.rc doc/rc/dark-16.theme doc/rc/dark-256.theme doc/rc/light-16.theme doc/rc/light-256.theme doc/rc/dark-blue-256.theme doc/rc/dark-green-256.theme doc/rc/dark-red-256.theme doc/rc/dark-violets-256.theme doc/rc/dark-yellow-green.theme
+dist_rcfile_DATA = doc/rc/holidays-US.rc doc/rc/holidays-CA.rc doc/rc/holidays-SE.rc doc/rc/holidays-DE.rc doc/rc/holidays-FR.rc doc/rc/dark-16.theme doc/rc/dark-256.theme doc/rc/light-16.theme doc/rc/light-256.theme doc/rc/dark-blue-256.theme doc/rc/dark-green-256.theme doc/rc/dark-red-256.theme doc/rc/dark-violets-256.theme doc/rc/dark-yellow-green.theme
 

doc/rc/holidays-CA.rc

@@ -0,0 +1,74 @@
+################################################################################
+# Sample calendar for Canada
+#
+# taskwarrior - a command line task list manager.
+#
+# Copyright 2010, Cory Donnelly.
+# All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the
+#
+#     Free Software Foundation, Inc.,
+#     51 Franklin Street, Fifth Floor,
+#     Boston, MA
+#     02110-1301
+#     USA
+#
+################################################################################
+
+calendar.holidays=sparse
+
+# 2010
+holiday.labourday.name=Labour Day
+holiday.labourday.date=20100906
+holiday.thanksgiving.name=Thanksgiving Day
+holiday.thanksgiving.date=20101011
+holiday.remembranceday.name=Remembrance Day
+holiday.remembranceday.date=20101111
+holiday.christmasday.name=Christmas Day
+holiday.christmasday.date=20101225
+holiday.boxingday.name=Boxing Day
+holiday.boxingday.date=20101226
+holiday.newyearseve.name=New Years Eve
+holiday.newyearseve.date=20101231
+
+# 2011
+holiday.newyearsday.name=New Years Day
+holiday.newyearsday.date=20110101
+holiday.familyday.name=Family Day
+holiday.familyday.date=20110117
+holiday.goodfriday.name=Good Friday
+holiday.goodfriday.date=20110422
+holiday.eastermonday.name=Easter Monday
+holiday.eastermonday.date=20110425
+holiday.canadaday.name=Canada Day
+holiday.canadaday.date=20110701
+holiday.firstmondayofaugust.name=First Monday of August
+holiday.firstmondayofaugust.date=20110801
+
+# Commented out to prevent collision with names of 2010 holidays
+# that haven't happened yet
+
+#holiday.labourday.name=Labour Day
+#holiday.labourday.date=20110905
+#holiday.thanksgiving.name=Thanksgiving Day
+#holiday.thanksgiving.date=20111010
+#holiday.remembranceday.name=Remembrance Day
+#holiday.remembranceday.date=20111111
+#holiday.christmasday.name=Christmas Day
+#holiday.christmasday.date=20111225
+#holiday.boxingday.name=Boxing Day
+#holiday.boxingday.date=20111226
+#holiday.newyearseve.name=New Years Eve
+#holiday.newyearseve.date=20111231

doc/rc/holidays-US.rc

@@ -58,15 +58,15 @@ holiday.independenceday.name=Independence Day
 holiday.independenceday.date=20110704
 
 # holiday.laborday.name=Labor Day
-# holiday.laborday.date=20100905
+# holiday.laborday.date=20110905
 # holiday.columbusday.name=Columbus Day
-# holiday.columbusday.date=20101010
+# holiday.columbusday.date=20111010
 # holiday.veteransdays.name=Veterans Day
-# holiday.veteransdays.date=20101111
+# holiday.veteransdays.date=20111111
 # holiday.thanksgiving.name=Thanksgiving Day
-# holiday.thanksgiving.date=20101124
+# holiday.thanksgiving.date=20111124
 # holiday.christmasday.name=Christmas Day
-# holiday.christmasday.date=20101225
+# holiday.christmasday.date=20111225
 # holiday.newyearseve.name=New Years Eve
-# holiday.newyearseve.date=20101231
+# holiday.newyearseve.date=20111231