holidays 1.0.3 → 1.0.4

data/lib/holidays/dk.rb

@@ -1,23 +1,24 @@
 # encoding: utf-8
 module Holidays
-  # This file is generated by the Ruby Holiday gem.
+  # This file is generated by the Ruby Holidays gem.
   #
   # Definitions loaded: data/dk.yaml
   #
-  # To use the definitions in this file, load them right after you load the 
+  # To use the definitions in this file, load it right after you load the 
   # Holiday gem:
   #
   #   require 'holidays'
   #   require 'holidays/dk'
   #
-  # More definitions are available at http://code.dunae.ca/holidays.
+  # All the definitions are available at https://github.com/alexdunae/holidays
   module DK # :nodoc:
-    DEFINED_REGIONS = [:dk]
+    def self.defined_regions
+      [:dk]
+    end
 
-    HOLIDAYS_BY_MONTH = {
-      5 => [{:mday => 1, :name => "Arbejdernes kampdag", :regions => [:dk]},
-            {:mday => 5, :type => :informal, :name => "Danmarks befrielse", :regions => [:dk]}],
-      0 => [{:function => lambda { |year| Holidays.easter(year)-49 }, :function_id => "easter(year)-49", :type => :informal, :name => "Fastelavn", :regions => [:dk]},
+    def self.holidays_by_month
+      {
+              0 => [{:function => lambda { |year| Holidays.easter(year)-49 }, :function_id => "easter(year)-49", :type => :informal, :name => "Fastelavn", :regions => [:dk]},
             {:function => lambda { |year| Holidays.easter(year)-7 }, :function_id => "easter(year)-7", :name => "Palmesøndag", :regions => [:dk]},
             {:function => lambda { |year| Holidays.easter(year)-3 }, :function_id => "easter(year)-3", :name => "Skærtorsdag", :regions => [:dk]},
             {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Langfredag", :regions => [:dk]},
@@ -27,22 +28,25 @@ module Holidays
             {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Kristi Himmelfartsdag", :regions => [:dk]},
             {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "Pinsedag", :regions => [:dk]},
             {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "2. Pinsedag", :regions => [:dk]}],
-      11 => [{:mday => 10, :type => :informal, :name => "Mortensaften", :regions => [:dk]}],
+      1 => [{:mday => 1, :name => "Nytårsdag", :regions => [:dk]}],
+      4 => [{:mday => 1, :type => :informal, :name => "1. april", :regions => [:dk]},
+            {:mday => 9, :type => :informal, :name => "Danmarks besættelse", :regions => [:dk]},
+            {:mday => 16, :type => :informal, :name => "Dronningens fødselsdag", :regions => [:dk]}],
+      5 => [{:mday => 1, :name => "Arbejdernes kampdag", :regions => [:dk]},
+            {:mday => 5, :type => :informal, :name => "Danmarks befrielse", :regions => [:dk]}],
       6 => [{:mday => 5, :name => "Grundlovsdag", :regions => [:dk]},
             {:mday => 15, :type => :informal, :name => "Valdemarsdag og Genforeningsdag", :regions => [:dk]},
             {:mday => 23, :type => :informal, :name => "Sankt Hans aften", :regions => [:dk]}],
-      1 => [{:mday => 1, :name => "Nytårsdag", :regions => [:dk]}],
+      11 => [{:mday => 10, :type => :informal, :name => "Mortensaften", :regions => [:dk]}],
       12 => [{:mday => 13, :type => :informal, :name => "Sankt Lucia", :regions => [:dk]},
             {:mday => 24, :name => "Juleaftensdag", :regions => [:dk]},
             {:mday => 25, :name => "1. juledag", :regions => [:dk]},
-            {:mday => 26, :name => "2. juledag", :regions => [:dk]}],
-      4 => [{:mday => 1, :type => :informal, :name => "1. april", :regions => [:dk]},
-            {:mday => 9, :type => :informal, :name => "Danmarks besættelse", :regions => [:dk]},
-            {:mday => 16, :type => :informal, :name => "Dronningens fødselsdag", :regions => [:dk]}]
-    }
+            {:mday => 26, :name => "2. juledag", :regions => [:dk]}]
+      }
+    end
   end
 
 
 end
 
-Holidays.merge_defs(Holidays::DK::DEFINED_REGIONS, Holidays::DK::HOLIDAYS_BY_MONTH)
+Holidays.merge_defs(Holidays::DK.defined_regions, Holidays::DK.holidays_by_month)

data/lib/holidays/el.rb

@@ -1,22 +1,24 @@
 # encoding: utf-8
 module Holidays
-  # This file is generated by the Ruby Holiday gem.
+  # This file is generated by the Ruby Holidays gem.
   #
   # Definitions loaded: data/el.yaml
   #
-  # To use the definitions in this file, load them right after you load the 
+  # To use the definitions in this file, load it right after you load the 
   # Holiday gem:
   #
   #   require 'holidays'
   #   require 'holidays/el'
   #
-  # More definitions are available at http://code.dunae.ca/holidays.
+  # All the definitions are available at https://github.com/alexdunae/holidays
   module EL # :nodoc:
-    DEFINED_REGIONS = [:el]
+    def self.defined_regions
+      [:el]
+    end
 
-    HOLIDAYS_BY_MONTH = {
-      5 => [{:mday => 1, :name => "Πρωτομαγιά", :regions => [:el]}],
-      0 => [{:function => lambda { |year| Holidays.orthodox_easter(year)-2 }, :function_id => "orthodox_easter(year)-2", :name => "Μεγάλη Παρασκευή", :regions => [:el]},
+    def self.holidays_by_month
+      {
+              0 => [{:function => lambda { |year| Holidays.orthodox_easter(year)-2 }, :function_id => "orthodox_easter(year)-2", :name => "Μεγάλη Παρασκευή", :regions => [:el]},
             {:function => lambda { |year| Holidays.orthodox_easter(year)-1 }, :function_id => "orthodox_easter(year)-1", :name => "Μεγάλο Σάββατο", :regions => [:el]},
             {:function => lambda { |year| Holidays.orthodox_easter(year) }, :function_id => "orthodox_easter(year)", :name => "Κυριακή του Πάσχα", :regions => [:el]},
             {:function => lambda { |year| Holidays.orthodox_easter(year)+1 }, :function_id => "orthodox_easter(year)+1", :name => "Δευτέρα του Πάσχα", :regions => [:el]},
@@ -24,15 +26,17 @@ module Holidays
             {:function => lambda { |year| Holidays.orthodox_easter(year)+50 }, :function_id => "orthodox_easter(year)+50", :name => "Αγίου Πνεύματος", :regions => [:el]}],
       1 => [{:mday => 1, :name => "Πρωτοχρονιά", :regions => [:el]},
             {:mday => 6, :name => "Θεοφάνεια", :regions => [:el]}],
-      12 => [{:mday => 25, :name => "Χριστούγεννα", :regions => [:el]},
-            {:mday => 26, :name => "Δεύτερη ημέρα των Χριστουγέννων", :regions => [:el]}],
-      8 => [{:mday => 15, :name => "Κοίμηση της Θεοτόκου", :regions => [:el]}],
       3 => [{:mday => 25, :name => "Επέτειος της Επανάστασης του 1821", :regions => [:el]}],
-      10 => [{:mday => 28, :name => "Επέτειος του Όχι", :regions => [:el]}]
-    }
+      5 => [{:mday => 1, :name => "Πρωτομαγιά", :regions => [:el]}],
+      8 => [{:mday => 15, :name => "Κοίμηση της Θεοτόκου", :regions => [:el]}],
+      10 => [{:mday => 28, :name => "Επέτειος του Όχι", :regions => [:el]}],
+      12 => [{:mday => 25, :name => "Χριστούγεννα", :regions => [:el]},
+            {:mday => 26, :name => "Δεύτερη ημέρα των Χριστουγέννων", :regions => [:el]}]
+      }
+    end
   end
 
 
 end
 
-Holidays.merge_defs(Holidays::EL::DEFINED_REGIONS, Holidays::EL::HOLIDAYS_BY_MONTH)
+Holidays.merge_defs(Holidays::EL.defined_regions, Holidays::EL.holidays_by_month)

data/lib/holidays/es.rb

@@ -1,53 +1,57 @@
 # encoding: utf-8
 module Holidays
-  # This file is generated by the Ruby Holiday gem.
+  # This file is generated by the Ruby Holidays gem.
   #
   # Definitions loaded: data/es.yaml
   #
-  # To use the definitions in this file, load them right after you load the 
+  # To use the definitions in this file, load it right after you load the 
   # Holiday gem:
   #
   #   require 'holidays'
   #   require 'holidays/es'
   #
-  # More definitions are available at http://code.dunae.ca/holidays.
+  # All the definitions are available at https://github.com/alexdunae/holidays
   module ES # :nodoc:
-    DEFINED_REGIONS = [:es, :es_m, :es_cn, :es_cm, :es_pv, :es_ct, :es_na, :es_v, :es_vc, :es_mu, :es_lo, :es_ib, :es_ga, :es_an, :es_ce, :es_o, :es_ex, :es_ar, :es_cl]
+    def self.defined_regions
+      [:es_pv, :es_ct, :es_na, :es_v, :es_vc, :es, :es_an, :es_ib, :es_cm, :es_mu, :es_m, :es_ar, :es_cl, :es_cn, :es_lo, :es_ga, :es_ce, :es_o, :es_ex]
+    end
 
-    HOLIDAYS_BY_MONTH = {
+    def self.holidays_by_month
+      {
+              0 => [{:function => lambda { |year| Holidays.easter(year)-3 }, :function_id => "easter(year)-3", :name => "Jueves Santo", :regions => [:es_pv, :es_ct, :es_na, :es_v, :es_vc]},
+            {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Viernes Santo", :regions => [:es]},
+            {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Lunes de Pascua", :regions => [:es_pv, :es_ct, :es_na, :es_v, :es_vc]}],
+      1 => [{:mday => 1, :name => "Año Nuevo", :regions => [:es]},
+            {:mday => 6, :name => "Día de Reyes", :regions => [:es]}],
+      2 => [{:mday => 28, :name => "Día de Andalucía", :regions => [:es_an]}],
+      3 => [{:mday => 1, :name => "Día de las Islas Baleares", :regions => [:es_ib]},
+            {:mday => 19, :name => "San José", :regions => [:es_v, :es_vc, :es_cm, :es_mu, :es_m]}],
+      4 => [{:mday => 23, :name => "San Jorge", :regions => [:es_ar, :es_cl]},
+            {:mday => 23, :name => "Día de Aragón", :regions => [:es_ar]}],
       5 => [{:mday => 1, :name => "Día del Trabajador", :regions => [:es]},
             {:mday => 2, :name => "Fiesta de la Comunidad", :regions => [:es_m]},
             {:mday => 30, :name => "Día de las Canarias", :regions => [:es_cn]},
             {:mday => 31, :name => "Día de la Región Castilla-La Mancha", :regions => [:es_cm]}],
-      0 => [{:function => lambda { |year| Holidays.easter(year)-3 }, :function_id => "easter(year)-3", :name => "Jueves Santo", :regions => [:es_pv, :es_ct, :es_na, :es_v, :es_vc]},
-            {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Viernes Santo", :regions => [:es]},
-            {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Lunes de Pascua", :regions => [:es_pv, :es_ct, :es_na, :es_v, :es_vc]}],
-      11 => [{:mday => 1, :name => "Todos los Santos", :regions => [:es]}],
       6 => [{:mday => 9, :name => "Día de la Región de Murcia", :regions => [:es_mu]},
             {:mday => 9, :name => "Día de La Rioja", :regions => [:es_lo]}],
-      1 => [{:mday => 1, :name => "Año Nuevo", :regions => [:es]},
-            {:mday => 6, :name => "Día de Reyes", :regions => [:es]}],
-      12 => [{:mday => 6, :name => "Día de la Constitución", :regions => [:es]},
-            {:mday => 8, :name => "Inmaculada Concepción", :regions => [:es]},
-            {:mday => 25, :name => "Navidad del Señor", :regions => [:es]},
-            {:mday => 26, :name => "San Esteban", :regions => [:es_ib, :es_ct]}],
       7 => [{:mday => 23, :name => "Santiago Apostol", :regions => [:es_ga]}],
-      2 => [{:mday => 28, :name => "Día de Andalucía", :regions => [:es_an]}],
       8 => [{:mday => 15, :name => "Asunción", :regions => [:es]}],
-      3 => [{:mday => 1, :name => "Día de las Islas Baleares", :regions => [:es_ib]},
-            {:mday => 19, :name => "San José", :regions => [:es_v, :es_vc, :es_cm, :es_mu, :es_m]}],
       9 => [{:mday => 2, :name => "Día de Ceuta", :regions => [:es_ce]},
             {:mday => 8, :name => "Día de Asturias", :regions => [:es_o]},
             {:mday => 8, :name => "Día de Extremadura", :regions => [:es_ex]},
             {:mday => 11, :name => "Fiesta Nacional de Cataluña", :regions => [:es_ct]}],
-      4 => [{:mday => 23, :name => "San Jorge", :regions => [:es_ar, :es_cl]},
-            {:mday => 23, :name => "Día de Aragón", :regions => [:es_ar]}],
       10 => [{:mday => 9, :name => "Día de Valencia", :regions => [:es_vc, :es_v]},
-            {:mday => 12, :name => "Día de la Hispanidad", :regions => [:es]}]
-    }
+            {:mday => 12, :name => "Día de la Hispanidad", :regions => [:es]}],
+      11 => [{:mday => 1, :name => "Todos los Santos", :regions => [:es]}],
+      12 => [{:mday => 6, :name => "Día de la Constitución", :regions => [:es]},
+            {:mday => 8, :name => "Inmaculada Concepción", :regions => [:es]},
+            {:mday => 25, :name => "Navidad del Señor", :regions => [:es]},
+            {:mday => 26, :name => "San Esteban", :regions => [:es_ib, :es_ct]}]
+      }
+    end
   end
 
 
 end
 
-Holidays.merge_defs(Holidays::ES::DEFINED_REGIONS, Holidays::ES::HOLIDAYS_BY_MONTH)
+Holidays.merge_defs(Holidays::ES.defined_regions, Holidays::ES.holidays_by_month)

data/lib/holidays/europe.rb

@@ -1,48 +1,27 @@
 # encoding: utf-8
 module Holidays
-  # This file is generated by the Ruby Holiday gem.
+  # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/at.yaml, data/cz.yaml, data/dk.yaml, data/de.yaml, data/el.yaml, data/es.yaml, data/fr.yaml, data/gb.yaml, data/ie.yaml, data/is.yaml, data/it.yaml, data/nl.yaml, data/no.yaml, data/pt.yaml
+  # Definitions loaded: data/at.yaml, data/cz.yaml, data/dk.yaml, data/de.yaml, data/el.yaml, data/es.yaml, data/fr.yaml, data/gb.yaml, data/ie.yaml, data/is.yaml, data/it.yaml, data/li.yaml, data/nl.yaml, data/no.yaml, data/pl.yaml, data/pt.yaml
   #
-  # To use the definitions in this file, load them right after you load the 
+  # To use the definitions in this file, load it right after you load the 
   # Holiday gem:
   #
   #   require 'holidays'
   #   require 'holidays/europe'
   #
-  # More definitions are available at http://code.dunae.ca/holidays.
+  # All the definitions are available at https://github.com/alexdunae/holidays
   module Europe # :nodoc:
-    DEFINED_REGIONS = [:at, :de_bw, :de_by, :de_nw, :de_rp, :de_sl, :de, :de_he, :cz, :dk, :no, :de_sn, :de_st, :de_bb, :de_mv, :de_th, :el, :es, :es_m, :es_cn, :es_cm, :es_pv, :es_ct, :es_na, :es_v, :es_vc, :es_mu, :es_lo, :es_ib, :es_ga, :es_an, :es_ce, :es_o, :es_ex, :es_ar, :es_cl, :fr, :gb, :ie, :je, :gb_jsy, :gg, :gb_gsy, :gb_eng, :gb_wls, :gb_eaw, :gb_nir, :gb_sct, :im, :gb_iom, :gb_con, :is, :it, :nl, :pt]
+    def self.defined_regions
+      [:at, :de, :li, :de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :cz, :dk, :no, :de_st, :de_bb, :de_mv, :de_sn, :de_th, :el, :es_pv, :es_ct, :es_na, :es_v, :es_vc, :es, :es_an, :es_ib, :es_cm, :es_mu, :es_m, :es_ar, :es_cl, :es_cn, :es_lo, :es_ga, :es_ce, :es_o, :es_ex, :fr, :gb, :gb_eng, :gb_wls, :gb_eaw, :gb_nir, :ie, :gb_sct, :gb_con, :je, :gb_jsy, :gg, :gb_gsy, :im, :gb_iom, :is, :it, :nl, :pl, :pt]
+    end
 
-    HOLIDAYS_BY_MONTH = {
-      5 => [{:mday => 1, :name => "Staatsfeiertag", :regions => [:at]},
-            {:mday => 1, :name => "Svátek práce", :regions => [:cz]},
-            {:mday => 8, :name => "Den vítězství", :regions => [:cz]},
-            {:mday => 1, :name => "Arbejdernes kampdag", :regions => [:dk]},
-            {:mday => 5, :type => :informal, :name => "Danmarks befrielse", :regions => [:dk]},
-            {:mday => 1, :name => "Tag der Arbeit", :regions => [:de]},
-            {:mday => 1, :name => "Πρωτομαγιά", :regions => [:el]},
-            {:mday => 1, :name => "Día del Trabajador", :regions => [:es]},
-            {:mday => 2, :name => "Fiesta de la Comunidad", :regions => [:es_m]},
-            {:mday => 30, :name => "Día de las Canarias", :regions => [:es_cn]},
-            {:mday => 31, :name => "Día de la Región Castilla-La Mancha", :regions => [:es_cm]},
-            {:mday => 1, :name => "Fête du travail", :regions => [:fr]},
-            {:mday => 8, :name => "Victoire 1945", :regions => [:fr]},
-            {:wday => 1, :week => 1, :name => "May Day", :regions => [:gb, :ie]},
-            {:mday => 9, :name => "Liberation Day", :regions => [:je, :gb_jsy, :gg, :gb_gsy]},
-            {:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:gb]},
-            {:mday => 1, :name => "Verkalýðsdagurinn", :regions => [:is]},
-            {:mday => 13, :name => "Mæðradagurinn", :regions => [:is]},
-            {:mday => 1, :name => "Festa dei Lavoratori", :regions => [:it]},
-            {:mday => 4, :name => "Dodenherdenking", :regions => [:nl]},
-            {:mday => 5, :name => "Bevrijdingsdag", :regions => [:nl]},
-            {:mday => 1, :name => "1. mai", :regions => [:no]},
-            {:mday => 17, :name => "17. mai", :regions => [:no]},
-            {:mday => 1, :name => "Dia do Trabalhador", :regions => [:pt]}],
-      0 => [{:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Ostermontag", :regions => [:at, :de]},
+    def self.holidays_by_month
+      {
+              0 => [{:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Ostermontag", :regions => [:at, :de, :li]},
             {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Christi Himmelfahrt", :regions => [:at, :de]},
-            {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "Pfingstmontag", :regions => [:at, :de]},
-            {:function => lambda { |year| Holidays.easter(year)+60 }, :function_id => "easter(year)+60", :name => "Fronleichnam", :regions => [:at, :de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl]},
+            {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "Pfingstmontag", :regions => [:at, :de, :li]},
+            {:function => lambda { |year| Holidays.easter(year)+60 }, :function_id => "easter(year)+60", :name => "Fronleichnam", :regions => [:at, :de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :li]},
             {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Velikonoční pondělí", :regions => [:cz]},
             {:function => lambda { |year| Holidays.easter(year)-49 }, :function_id => "easter(year)-49", :type => :informal, :name => "Fastelavn", :regions => [:dk, :no]},
             {:function => lambda { |year| Holidays.easter(year)-7 }, :function_id => "easter(year)-7", :name => "Palmesøndag", :regions => [:dk, :no]},
@@ -54,7 +33,7 @@ module Holidays
             {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Kristi Himmelfartsdag", :regions => [:dk, :no]},
             {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "Pinsedag", :regions => [:dk]},
             {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "2. Pinsedag", :regions => [:dk]},
-            {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Karfreitag", :regions => [:de]},
+            {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Karfreitag", :regions => [:de, :li]},
             {:function => lambda { |year| Holidays.orthodox_easter(year)-2 }, :function_id => "orthodox_easter(year)-2", :name => "Μεγάλη Παρασκευή", :regions => [:el]},
             {:function => lambda { |year| Holidays.orthodox_easter(year)-1 }, :function_id => "orthodox_easter(year)-1", :name => "Μεγάλο Σάββατο", :regions => [:el]},
             {:function => lambda { |year| Holidays.orthodox_easter(year) }, :function_id => "orthodox_easter(year)", :name => "Κυριακή του Πάσχα", :regions => [:el]},
@@ -85,6 +64,9 @@ module Holidays
             {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "Annar í hvítasunnu", :regions => [:is]},
             {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Pasqua", :regions => [:it]},
             {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Lunedì dell'Angelo", :regions => [:it]},
+            {:function => lambda { |year| Holidays.easter(year)-47 }, :function_id => "easter(year)-47", :name => "Fasnachtsdienstag", :regions => [:li]},
+            {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :type => :informal, :name => "Ostern", :regions => [:li]},
+            {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Auffahrt", :regions => [:li]},
             {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Goede Vrijdag", :regions => [:nl]},
             {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Pasen", :regions => [:nl]},
             {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Pasen", :regions => [:nl]},
@@ -95,36 +77,26 @@ module Holidays
             {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "1. påskedag", :regions => [:no]},
             {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "1. pinsedag", :regions => [:no]},
             {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "2. pinsedag", :regions => [:no]},
+            {:function => lambda { |year| Holidays.easter(year)-52 }, :function_id => "easter(year)-52", :type => :informal, :name => "Tłusty Czwartek", :regions => [:pl]},
+            {:function => lambda { |year| Holidays.easter(year)-47 }, :function_id => "easter(year)-47", :type => :informal, :name => "Ostatki", :regions => [:pl]},
+            {:function => lambda { |year| Holidays.easter(year)-46 }, :function_id => "easter(year)-46", :type => :informal, :name => "Środa Popielcowa", :regions => [:pl]},
+            {:function => lambda { |year| Holidays.easter(year)-7 }, :function_id => "easter(year)-7", :type => :informal, :name => "Niedziela Palmowa", :regions => [:pl]},
+            {:function => lambda { |year| Holidays.easter(year)-3 }, :function_id => "easter(year)-3", :type => :informal, :name => "Wielki Czwartek", :regions => [:pl]},
+            {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :type => :informal, :name => "Wielki Piątek", :regions => [:pl]},
+            {:function => lambda { |year| Holidays.easter(year)-1 }, :function_id => "easter(year)-1", :type => :informal, :name => "Wielka Sobota", :regions => [:pl]},
+            {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Niedziela Wielkanocna", :regions => [:pl]},
+            {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Poniedziałek Wielkanocny (Lany Poniedziałek)", :regions => [:pl]},
+            {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "Zesłanie Ducha Świętego (Zielone Świątki)", :regions => [:pl]},
+            {:function => lambda { |year| Holidays.easter(year)+60 }, :function_id => "easter(year)+60", :name => "Uroczystość Najświętszego Ciała i Krwi Pańskiej (Boże Ciało)", :regions => [:pl]},
             {:function => lambda { |year| Holidays.easter(year)-47 }, :function_id => "easter(year)-47", :type => :informal, :name => "Carnaval", :regions => [:pt]},
             {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Sexta-feira Santa", :regions => [:pt]},
             {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Páscoa", :regions => [:pt]},
             {:function => lambda { |year| Holidays.easter(year)+60 }, :function_id => "easter(year)+60", :name => "Corpo de Deus", :regions => [:pt]}],
-      11 => [{:mday => 1, :name => "Allerheiligen", :regions => [:at, :de_bw, :de_by, :de_nw, :de_rp, :de_sl]},
-            {:mday => 17, :name => "Den boje za svobodu a demokracii", :regions => [:cz]},
-            {:mday => 10, :type => :informal, :name => "Mortensaften", :regions => [:dk]},
-            {:function => lambda { |year| Holidays.de_buss_und_bettag(year) }, :function_id => "de_buss_und_bettag(year)", :name => "Buß- und Bettag", :regions => [:de_sn]},
-            {:mday => 1, :name => "Todos los Santos", :regions => [:es]},
-            {:mday => 1, :name => "Toussaint", :regions => [:fr]},
-            {:mday => 11, :name => "Armistice 1918", :regions => [:fr]},
-            {:mday => 5, :type => :informal, :name => "Guy Fawkes Day", :regions => [:gb]},
-            {:mday => 16, :name => "Dagur íslenskrar tungu", :regions => [:is]},
-            {:mday => 1, :name => "Ognissanti", :regions => [:it]},
-            {:mday => 1, :name => "Todos os Santos", :regions => [:pt]}],
-      6 => [{:mday => 5, :name => "Grundlovsdag", :regions => [:dk]},
-            {:mday => 15, :type => :informal, :name => "Valdemarsdag og Genforeningsdag", :regions => [:dk]},
-            {:mday => 23, :type => :informal, :name => "Sankt Hans aften", :regions => [:dk]},
-            {:mday => 9, :name => "Día de la Región de Murcia", :regions => [:es_mu]},
-            {:mday => 9, :name => "Día de La Rioja", :regions => [:es_lo]},
-            {:wday => 1, :week => 1, :name => "Bank Holiday", :regions => [:ie]},
-            {:mday => 3, :type => :informal, :name => "Sjómannadagurinn", :regions => [:is]},
-            {:mday => 17, :name => "Lýðveldisdagurinn", :regions => [:is]},
-            {:mday => 2, :name => "Festa della Repubblica", :regions => [:it]},
-            {:mday => 10, :name => "Dia de Portugal", :regions => [:pt]}],
-      1 => [{:mday => 1, :name => "Neujahrstag", :regions => [:at, :de]},
+      1 => [{:mday => 1, :name => "Neujahrstag", :regions => [:at, :de, :li]},
             {:mday => 6, :name => "Heilige Drei Könige", :regions => [:at]},
             {:mday => 1, :name => "Den obnovy samostatného českého státu", :regions => [:cz]},
             {:mday => 1, :name => "Nytårsdag", :regions => [:dk]},
-            {:mday => 6, :name => "Heilige Drei Könige", :regions => [:de_bw, :de_by, :de_st]},
+            {:mday => 6, :name => "Heilige Drei Könige", :regions => [:de_bw, :de_by, :de_st, :li, :li]},
             {:mday => 1, :name => "Πρωτοχρονιά", :regions => [:el]},
             {:mday => 6, :name => "Θεοφάνεια", :regions => [:el]},
             {:mday => 1, :name => "Año Nuevo", :regions => [:es]},
@@ -139,7 +111,77 @@ module Holidays
             {:mday => 6, :name => "Epifania", :regions => [:it]},
             {:mday => 1, :name => "Nieuwjaar", :regions => [:nl]},
             {:mday => 1, :name => "Nyttårsdag", :regions => [:no]},
+            {:mday => 1, :name => "Nowy Rok", :regions => [:pl]},
+            {:function => lambda { |year| Holidays.pl_trzech_kroli(year) }, :function_id => "pl_trzech_kroli(year)", :name => "Objawienie Pańskie (święto Trzech Króli)", :regions => [:pl]},
+            {:function => lambda { |year| Holidays.pl_trzech_kroli_informal(year) }, :function_id => "pl_trzech_kroli_informal(year)", :type => :informal, :name => "Objawienie Pańskie (święto Trzech Króli)", :regions => [:pl]},
+            {:mday => 21, :type => :informal, :name => "Dzień Babci", :regions => [:pl]},
+            {:mday => 22, :type => :informal, :name => "Dzień Dziadka", :regions => [:pl]},
             {:mday => 1, :name => "Ano Novo", :regions => [:pt]}],
+      5 => [{:mday => 1, :name => "Staatsfeiertag", :regions => [:at]},
+            {:mday => 1, :name => "Svátek práce", :regions => [:cz]},
+            {:mday => 8, :name => "Den vítězství", :regions => [:cz]},
+            {:mday => 1, :name => "Arbejdernes kampdag", :regions => [:dk]},
+            {:mday => 5, :type => :informal, :name => "Danmarks befrielse", :regions => [:dk]},
+            {:mday => 1, :name => "Tag der Arbeit", :regions => [:de, :li]},
+            {:mday => 1, :name => "Πρωτομαγιά", :regions => [:el]},
+            {:mday => 1, :name => "Día del Trabajador", :regions => [:es]},
+            {:mday => 2, :name => "Fiesta de la Comunidad", :regions => [:es_m]},
+            {:mday => 30, :name => "Día de las Canarias", :regions => [:es_cn]},
+            {:mday => 31, :name => "Día de la Región Castilla-La Mancha", :regions => [:es_cm]},
+            {:mday => 1, :name => "Fête du travail", :regions => [:fr]},
+            {:mday => 8, :name => "Victoire 1945", :regions => [:fr]},
+            {:wday => 1, :week => 1, :name => "May Day", :regions => [:gb, :ie]},
+            {:mday => 9, :name => "Liberation Day", :regions => [:je, :gb_jsy, :gg, :gb_gsy]},
+            {:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:gb]},
+            {:mday => 1, :name => "Verkalýðsdagurinn", :regions => [:is]},
+            {:mday => 13, :name => "Mæðradagurinn", :regions => [:is]},
+            {:mday => 1, :name => "Festa dei Lavoratori", :regions => [:it]},
+            {:mday => 4, :name => "Dodenherdenking", :regions => [:nl]},
+            {:mday => 5, :name => "Bevrijdingsdag", :regions => [:nl]},
+            {:mday => 1, :name => "1. mai", :regions => [:no]},
+            {:mday => 17, :name => "17. mai", :regions => [:no]},
+            {:mday => 1, :name => "Święto Państwowe (Święto Pracy)", :regions => [:pl]},
+            {:mday => 2, :type => :informal, :name => "Dzień Flagi Rzeczpospolitej Polskiej", :regions => [:pl]},
+            {:mday => 3, :name => "Święto Narodowe Trzeciego Maja", :regions => [:pl]},
+            {:mday => 1, :name => "Dia do Trabalhador", :regions => [:pt]}],
+      8 => [{:mday => 15, :name => "Mariä Himmelfahrt", :regions => [:at]},
+            {:mday => 15, :name => "Mariä Himmelfahrt", :regions => [:de_by, :de_sl]},
+            {:mday => 15, :name => "Κοίμηση της Θεοτόκου", :regions => [:el]},
+            {:mday => 15, :name => "Asunción", :regions => [:es]},
+            {:mday => 15, :name => "Assomption", :regions => [:fr]},
+            {:wday => 1, :week => 1, :name => "Bank Holiday", :regions => [:gb_sct, :ie]},
+            {:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:gb_eng, :gb_wls, :gb_eaw, :gb_nir]},
+            {:wday => 1, :week => 1, :name => "Frídagur verslunarmanna", :regions => [:is]},
+            {:mday => 15, :name => "Assunzione", :regions => [:it]},
+            {:mday => 15, :name => "Staatsfeiertag", :regions => [:li]},
+            {:mday => 15, :name => "Wniebowzięcie Najświętszej Maryi Panny", :regions => [:pl]},
+            {:mday => 15, :name => "Święto Wojska Polskiego", :regions => [:pl]},
+            {:mday => 15, :name => "Assunção de Nossa Senhora", :regions => [:pt]}],
+      10 => [{:mday => 26, :name => "Nationalfeiertag", :regions => [:at]},
+            {:mday => 28, :name => "Den vzniku samostatného československého státu", :regions => [:cz]},
+            {:mday => 3, :name => "Tag der Deutschen Einheit", :regions => [:de]},
+            {:mday => 31, :name => "Reformationstag", :regions => [:de_bb, :de_mv, :de_sn, :de_st, :de_th]},
+            {:mday => 28, :name => "Επέτειος του Όχι", :regions => [:el]},
+            {:mday => 9, :name => "Día de Valencia", :regions => [:es_vc, :es_v]},
+            {:mday => 12, :name => "Día de la Hispanidad", :regions => [:es]},
+            {:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:ie]},
+            {:mday => 14, :type => :informal, :name => "Dzień Nauczyciela (Dzień Edukacji Narodowej)", :regions => [:pl]},
+            {:mday => 5, :name => "Implantação da República", :regions => [:pt]}],
+      11 => [{:mday => 1, :name => "Allerheiligen", :regions => [:at, :de_bw, :de_by, :de_nw, :de_rp, :de_sl, :li]},
+            {:mday => 17, :name => "Den boje za svobodu a demokracii", :regions => [:cz]},
+            {:mday => 10, :type => :informal, :name => "Mortensaften", :regions => [:dk]},
+            {:function => lambda { |year| Holidays.de_buss_und_bettag(year) }, :function_id => "de_buss_und_bettag(year)", :name => "Buß- und Bettag", :regions => [:de_sn]},
+            {:mday => 1, :name => "Todos los Santos", :regions => [:es]},
+            {:mday => 1, :name => "Toussaint", :regions => [:fr]},
+            {:mday => 11, :name => "Armistice 1918", :regions => [:fr]},
+            {:mday => 5, :type => :informal, :name => "Guy Fawkes Day", :regions => [:gb]},
+            {:mday => 16, :name => "Dagur íslenskrar tungu", :regions => [:is]},
+            {:mday => 1, :name => "Ognissanti", :regions => [:it]},
+            {:mday => 1, :name => "Wszystkich Świętych", :regions => [:pl]},
+            {:mday => 2, :type => :informal, :name => "Dzień Zaduszny", :regions => [:pl]},
+            {:mday => 11, :name => "Narodowe Święto Niepodległości", :regions => [:pl]},
+            {:mday => 29, :type => :informal, :name => "Andrzejki", :regions => [:pl]},
+            {:mday => 1, :name => "Todos os Santos", :regions => [:pt]}],
       12 => [{:mday => 8, :name => "Mariä Empfängnis", :regions => [:at]},
             {:mday => 25, :name => "1. Weihnachtstag", :regions => [:at, :de]},
             {:mday => 26, :name => "2. Weihnachtstag", :regions => [:at, :de]},
@@ -168,11 +210,22 @@ module Holidays
             {:mday => 8, :name => "Immacolata Concezione", :regions => [:it]},
             {:mday => 25, :name => "Natale", :regions => [:it]},
             {:mday => 26, :name => "Santo Stefano", :regions => [:it]},
+            {:mday => 8, :name => "Maria Empfängnis", :regions => [:li]},
+            {:mday => 24, :name => "Heilig Abend", :regions => [:li]},
+            {:mday => 25, :name => "Weihnachten", :regions => [:li]},
+            {:mday => 26, :name => "Stefanstag", :regions => [:li]},
+            {:mday => 31, :name => "Silvester", :regions => [:li]},
             {:mday => 5, :type => :informal, :name => "Sinterklaas", :regions => [:nl]},
             {:mday => 25, :name => "Kerstmis", :regions => [:nl]},
             {:mday => 26, :name => "Kerstmis", :regions => [:nl]},
             {:mday => 24, :type => :informal, :name => "Julaften", :regions => [:no]},
             {:mday => 31, :type => :informal, :name => "Nyttårsaften", :regions => [:no]},
+            {:mday => 4, :type => :informal, :name => "Barbórka (Dzień Górnika, Naftowca i Gazownika)", :regions => [:pl]},
+            {:mday => 6, :type => :informal, :name => "Mikołajki", :regions => [:pl]},
+            {:mday => 24, :type => :informal, :name => "Wigilia Bożego Narodzenia", :regions => [:pl]},
+            {:mday => 25, :name => "pierwszy dzień Bożego Narodzenia", :regions => [:pl]},
+            {:mday => 26, :name => "drugi dzień Bożego Narodzenia", :regions => [:pl]},
+            {:mday => 31, :type => :informal, :name => "Sylwester", :regions => [:pl]},
             {:mday => 1, :name => "Restauração da Independência", :regions => [:pt]},
             {:mday => 8, :name => "Imaculada Conceição", :regions => [:pt]},
             {:mday => 25, :name => "Natal", :regions => [:pt]}],
@@ -182,28 +235,13 @@ module Holidays
             {:mday => 14, :name => "Fête nationale", :regions => [:fr]},
             {:mday => 5, :name => "Tynwald Day", :regions => [:im, :gb_iom]},
             {:mday => 12, :name => "Battle of the Boyne", :regions => [:gb_nir]}],
-      2 => [{:mday => 28, :name => "Día de Andalucía", :regions => [:es_an]},
-            {:mday => 18, :type => :informal, :name => "Konudagur", :regions => [:is]}],
-      8 => [{:mday => 15, :name => "Mariä Himmelfahrt", :regions => [:at]},
-            {:mday => 15, :name => "Mariä Himmelfahrt", :regions => [:de_by, :de_sl]},
-            {:mday => 15, :name => "Κοίμηση της Θεοτόκου", :regions => [:el]},
-            {:mday => 15, :name => "Asunción", :regions => [:es]},
-            {:mday => 15, :name => "Assomption", :regions => [:fr]},
-            {:wday => 1, :week => 1, :name => "Bank Holiday", :regions => [:gb_sct, :ie]},
-            {:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:gb_eng, :gb_wls, :gb_eaw, :gb_nir]},
-            {:wday => 1, :week => 1, :name => "Frídagur verslunarmanna", :regions => [:is]},
-            {:mday => 15, :name => "Assunzione", :regions => [:it]},
-            {:mday => 15, :name => "Assunção de Nossa Senhora", :regions => [:pt]}],
-      3 => [{:mday => 25, :name => "Επέτειος της Επανάστασης του 1821", :regions => [:el]},
-            {:mday => 1, :name => "Día de las Islas Baleares", :regions => [:es_ib]},
-            {:mday => 19, :name => "San José", :regions => [:es_v, :es_vc, :es_cm, :es_mu, :es_m]},
-            {:mday => 5, :name => "St. Piran's Day", :regions => [:gb_con]},
-            {:mday => 17, :name => "St. Patrick's Day", :regions => [:gb_nir, :ie]}],
       9 => [{:mday => 28, :name => "Den české státnosti", :regions => [:cz]},
             {:mday => 2, :name => "Día de Ceuta", :regions => [:es_ce]},
             {:mday => 8, :name => "Día de Asturias", :regions => [:es_o]},
             {:mday => 8, :name => "Día de Extremadura", :regions => [:es_ex]},
-            {:mday => 11, :name => "Fiesta Nacional de Cataluña", :regions => [:es_ct]}],
+            {:mday => 11, :name => "Fiesta Nacional de Cataluña", :regions => [:es_ct]},
+            {:mday => 8, :name => "Maria Geburt", :regions => [:li]},
+            {:mday => 30, :type => :informal, :name => "Dzień Chłopaka", :regions => [:pl]}],
       4 => [{:mday => 1, :type => :informal, :name => "1. april", :regions => [:dk]},
             {:mday => 9, :type => :informal, :name => "Danmarks besættelse", :regions => [:dk]},
             {:mday => 16, :type => :informal, :name => "Dronningens fødselsdag", :regions => [:dk]},
@@ -212,19 +250,49 @@ module Holidays
             {:function => lambda { |year| Holidays.is_sumardagurinn_fyrsti(year) }, :function_id => "is_sumardagurinn_fyrsti(year)", :name => "Sumardagurinn fyrsti", :regions => [:is]},
             {:mday => 25, :name => "Festa della Liberazione", :regions => [:it]},
             {:mday => 30, :name => "Koninginnedag", :regions => [:nl]},
+            {:mday => 1, :type => :informal, :name => "Prima Aprilis", :regions => [:pl]},
+            {:mday => 22, :type => :informal, :name => "Międzynarodowy Dzień Ziemi", :regions => [:pl]},
             {:mday => 25, :name => "Dia da Liberdade", :regions => [:pt]}],
-      10 => [{:mday => 26, :name => "Nationalfeiertag", :regions => [:at]},
-            {:mday => 28, :name => "Den vzniku samostatného československého státu", :regions => [:cz]},
-            {:mday => 3, :name => "Tag der Deutschen Einheit", :regions => [:de]},
-            {:mday => 31, :name => "Reformationstag", :regions => [:de_bb, :de_mv, :de_sn, :de_st, :de_th]},
-            {:mday => 28, :name => "Επέτειος του Όχι", :regions => [:el]},
-            {:mday => 9, :name => "Día de Valencia", :regions => [:es_vc, :es_v]},
-            {:mday => 12, :name => "Día de la Hispanidad", :regions => [:es]},
-            {:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:ie]},
-            {:mday => 5, :name => "Implantação da República", :regions => [:pt]}]
-    }
+      6 => [{:mday => 5, :name => "Grundlovsdag", :regions => [:dk]},
+            {:mday => 15, :type => :informal, :name => "Valdemarsdag og Genforeningsdag", :regions => [:dk]},
+            {:mday => 23, :type => :informal, :name => "Sankt Hans aften", :regions => [:dk]},
+            {:mday => 9, :name => "Día de la Región de Murcia", :regions => [:es_mu]},
+            {:mday => 9, :name => "Día de La Rioja", :regions => [:es_lo]},
+            {:wday => 1, :week => 1, :name => "Bank Holiday", :regions => [:ie]},
+            {:mday => 3, :type => :informal, :name => "Sjómannadagurinn", :regions => [:is]},
+            {:mday => 17, :name => "Lýðveldisdagurinn", :regions => [:is]},
+            {:mday => 2, :name => "Festa della Repubblica", :regions => [:it]},
+            {:mday => 23, :type => :informal, :name => "Dzień Ojca", :regions => [:pl]},
+            {:mday => 10, :name => "Dia de Portugal", :regions => [:pt]}],
+      3 => [{:mday => 25, :name => "Επέτειος της Επανάστασης του 1821", :regions => [:el]},
+            {:mday => 1, :name => "Día de las Islas Baleares", :regions => [:es_ib]},
+            {:mday => 19, :name => "San José", :regions => [:es_v, :es_vc, :es_cm, :es_mu, :es_m]},
+            {:mday => 5, :name => "St. Piran's Day", :regions => [:gb_con]},
+            {:mday => 17, :name => "St. Patrick's Day", :regions => [:gb_nir, :ie]},
+            {:mday => 19, :name => "St. Josef", :regions => [:li]},
+            {:mday => 8, :type => :informal, :name => "Dzień Kobiet", :regions => [:pl]},
+            {:mday => 10, :type => :informal, :name => "Dzień Mężczyzn", :regions => [:pl]}],
+      2 => [{:mday => 28, :name => "Día de Andalucía", :regions => [:es_an]},
+            {:mday => 18, :type => :informal, :name => "Konudagur", :regions => [:is]},
+            {:mday => 2, :name => "Maria Lichtmess", :regions => [:li]},
+            {:mday => 2, :type => :informal, :name => "Ofiarowanie Pańskie (Matki Boskiej Gromnicznej)", :regions => [:pl]},
+            {:mday => 14, :type => :informal, :name => "Dzień Zakochanych (Walentynki)", :regions => [:pl]}]
+      }
+    end
   end
 
+# Germany: Wednesday before November 23
+def self.de_buss_und_bettag(year)
+  date = Date.civil(year,11,23)
+  if date.wday > 3
+    date -= (date.wday - 3)
+  else
+    date -= (date.wday + 4)
+  end
+  date
+end
+
+
 # Iceland: first day of summer (Thursday after 18 April)
 def self.is_sumardagurinn_fyrsti(year)
   date = Date.civil(year,4,18)
@@ -237,19 +305,19 @@ def self.is_sumardagurinn_fyrsti(year)
 end
 
 
-# Germany: Wednesday before November 23
-def self.de_buss_und_bettag(year)
-  date = Date.civil(year,11,23)
-  if date.wday > 3
-    date -= (date.wday - 3)
-  else
-    date -= (date.wday + 4)
-  end
-  date
+# Poland: January 6 is holiday since 2011
+def self.pl_trzech_kroli(year)
+  year >= 2011 ? 6 : nil
+end
+
+
+# Poland: January 6 wasn't holiday before 2011
+def self.pl_trzech_kroli_informal(year)
+  year < 2011 ? 6 : nil
 end
 
 
 
 end
 
-Holidays.merge_defs(Holidays::Europe::DEFINED_REGIONS, Holidays::Europe::HOLIDAYS_BY_MONTH)
+Holidays.merge_defs(Holidays::Europe.defined_regions, Holidays::Europe.holidays_by_month)