From 8a2e979726e82806c983aab51a75f6a335c77b15 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 17 Sep 2010 20:23:24 -0400
Subject: [PATCH] Holidays

- Added UK file.
- Updated NEWS and ChangeLog.
---
 ChangeLog             |  1 +
 Makefile.am           |  2 +-
 NEWS                  |  2 +-
 doc/rc/holidays-UK.rc | 56 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 doc/rc/holidays-UK.rc

diff --git a/ChangeLog b/ChangeLog
index 7dd3ae879..7a6fc4a1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,7 @@
  + The color.keyword.XXX color rule now applies to annotations too.
  + Importing the same YAML twice now generates an error.
  + Two new color themes (thanks to Kathryn Andersen).
+ + More localized holiday files for US, CA, SE, DE, FR and UK.
  + Fixed bug #427, preventing the task edit command to parse annotation
    dates with spaces.
  + Fixed bug #433, making task command output more consistent.
diff --git a/Makefile.am b/Makefile.am
index d90b1e623..24d7f4ea2 100644
--- a/Makefile.am
+++ b/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-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
+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/holidays-UK.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
 
diff --git a/NEWS b/NEWS
index 6e038eb1a..4014cdf50 100644
--- a/NEWS
+++ b/NEWS
@@ -22,7 +22,7 @@ New Features in taskwarrior 1.9.3
   - Certain characters (#, $, @) are now supported for use in tags.
   - User-controlled color rule precedence.
   - Two new color themes.
-  - New holiday files for US, SE, DE, CA and FR localizations.
+  - New holiday files for US, SE, DE, CA, FR and UK localizations.
 
   Please refer to the ChangeLog file for full details.  There are too many to
   list here.
diff --git a/doc/rc/holidays-UK.rc b/doc/rc/holidays-UK.rc
new file mode 100644
index 000000000..6bdef084b
--- /dev/null
+++ b/doc/rc/holidays-UK.rc
@@ -0,0 +1,56 @@
+################################################################################
+# Sample calendar for the UK
+#
+# taskwarrior - a command line task list manager.
+#
+# Copyright 2010, Federico Hernandez.
+# 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.christmas.name=Christmas Day
+holiday.christmas.date=20101225
+holiday.boxingday.name=Boxing Day
+holiday.boxingday.date=20101226
+
+# 2011
+holiday.newyear.name=New Year's Day
+holiday.newyear.date=20110101
+holiday.goodfriday.name=Good Friday
+holiday.goodfriday.date=20110422
+holiday.eastermonday.name=Easter Monday
+holiday.eastermonday.date=20110425
+holiday.may.name=Early May Bank Holiday
+holiday.may.name=20110502
+holiday.spring.name=Spring Bank Holiday
+holiday.spring.name=20110530
+holiday.august.name=August Bank Holiday
+holiday.august.name=20110829
+
+#holiday.christmas.name=Christmas Day
+#holiday.christmas.date=20111225
+#holiday.boxingday.name=Boxing Day
+#holiday.boxingday.date=20111226
+