From 07fac74e8fad42bc9fea4f37c6b6a11882f66026 Mon Sep 17 00:00:00 2001
From: Nick Hall <nick__hall@hotmail.com>
Date: Fri, 29 Jan 2010 18:55:38 +0000
Subject: [PATCH] Tweaks to English holidays

svn: r14169
---
 src/plugins/lib/holidays.xml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/plugins/lib/holidays.xml b/src/plugins/lib/holidays.xml
index 0bd0f912c..6087d9d6c 100644
--- a/src/plugins/lib/holidays.xml
+++ b/src/plugins/lib/holidays.xml
@@ -409,28 +409,33 @@
     <date name="Annandag Jul" value="*/12/26" type="religious" />
   </country>
   <country name="England">
-    <date name="New Year's Day" value="*/1/1" offset="workday" type="National" />
+    <date name="New Year's Day" value="*/1/1" type="National" />
+    <date name="Bank Holiday" value="*/1/1" offset="+1" if="isodow(y, m, d) == 7" type="national" />
+    <date name="Bank Holiday" value="*/1/1" offset="+2" if="isodow(y, m, d) == 6" type="national" />
     <date name="Good Friday" value="> easter(y)" offset="-2" type="National" />
     <date name="Easter Monday" value="> easter(y)" offset="+1" type="National" />
     <date name="May Bank Holiday" value="*/1/mon/may" type="National" />
     <date name="Spring Bank Holiday" value="*/-1/mon/may" if="y != 2012" type="National" />
     <date name="Spring Bank Holiday" value="2012/6/4" type="National" />
-    <date name="Queen's Diamond Jubilee" value="2012/6/5" type="National" />
+    <date name="Diamond Jubilee" value="2012/6/5" type="National" />
     <date name="Summer Bank Holiday" value="*/-1/mon/aug" type="National" />
     <date name="Christmas Day" value="*/dec/25" type="national" />
     <date name="Boxing Day" value="*/dec/26" type="national" />
-    <date name="Holiday in lieu of Christmas Day" value="*/dec/25" offset="+2" if="isodow(y, m, d) > 5" type="national" />
-    <date name="Holiday in lieu of Boxing Day" value="*/dec/26" offset = "+2" if="isodow(y, m, d) > 5" type="national" />
+    <date name="Bank Holiday" value="*/dec/25" offset="+2" if="isodow(y, m, d) > 5" type="national" />
+    <date name="Bank Holiday" value="*/dec/26" offset="+2" if="isodow(y, m, d) > 5" type="national" />
     <date name="BST starts" value="*/-1/sun/mar" type="Informational" />
     <date name="BST ends" value="*/-1/sun/oct" type="Informational" />
     <date name="Valentine's Day" value="*/2/14" type="Secular" />
     <date name="Shrove Tuesday" value="> easter(y)" offset="-47" type="Religious" />
+    <date name="Ash Wednesday" value="> easter(y)" offset="-46" type="Religious" />
+    <date name="Easter Sunday" value="> easter(y)" type="Religious" />
     <date name="April Fool's Day" value="*/4/1" type="Secular" />
     <date name="St. George's Day" value="*/4/23" type="Secular" />
     <date name="Mothering Sunday" value="> easter(y)" offset="-21" type="Secular" />
     <date name="Fathers' Day" value="*/3/sun/jun" type="Secular" />
     <date name="Halloween" value="*/10/31" type="Secular" />
     <date name="Guy Fawkes Night" value="*/11/5" type="Secular" />
-    <date name="Remembrance Day" value="*/11/11" type="Secular" />
+    <date name="Armistice Day" value="*/11/11" type="Secular" />
+    <date name="Remembrance Sunday" value="*/2/sun/nov" type="Secular" />
   </country>
 </calendar>