holidays 1.0.6 → 1.0.8

data/lib/holidays.rb

@@ -46,8 +46,6 @@ module Holidays
   # Exception thrown when an unknown region is requested.
   class UnknownRegionError < ArgumentError; end
 
-  VERSION = '1.0.6'
-
   @@regions = []
   @@holidays_by_month = {}
   @@proc_cache = {}
@@ -323,6 +321,19 @@ private
     return regions, observed, informal
   end
 
+  # Derive the containing region from a sub region wild-card or a sub region
+  # and load its definition. (Common code factored out from parse_regions)
+  def self.load_containing_region(sub_reg)
+    prefix = sub_reg.split('_').first
+    unless @@regions.include?(prefix.to_sym)
+      begin
+        require "holidays/#{prefix}"
+      rescue LoadError
+        raise UnknownRegionError, "Could not load holidays/#{prefix}"
+      end
+    end
+  end
+
   # Check regions against list of supported regions and return an array of
   # symbols.
   #
@@ -335,17 +346,10 @@ private
     regions = regions.collect { |r| r.to_sym }
 
     # Found sub region wild-card
-    regions.delete_if do |reg|
-      if reg.to_s =~ /_$/
-        prefix = reg.to_s.split('_').first
-        unless @@regions.include?(prefix.to_sym)
-          begin
-            require "holidays/#{prefix}"
-          rescue LoadError
-            raise UnknownRegionError, "Could not load holidays/#{prefix}"
-          end
-        end
-        regions << @@regions.select { |dr| dr.to_s =~ Regexp.new("^#{reg}") }
+    regions.delete_if do |r|
+      if r.to_s =~ /_$/
+        load_containing_region(r.to_s)
+        regions << @@regions.select { |dr| dr.to_s =~ Regexp.new("^#{r.to_s}") }
         true
       end
     end
@@ -359,7 +363,13 @@ private
         begin
           require "holidays/#{r.to_s}"
         rescue LoadError => e
-          raise UnknownRegionError, "Could not load holidays/#{r}"
+          # This could be a sub region that does not have any holiday
+          # definitions of its own; try to load the containing region instead.
+          if r.to_s =~ /_/
+            load_containing_region(r.to_s)
+          else
+            raise UnknownRegionError, "Could not load holidays/#{r.to_s}"
+          end
         end
       end
     end

data/lib/holidays/MANIFEST

@@ -8,9 +8,11 @@ The following definition files are included in this installation:
 * holidays/br
 * holidays/ca
 * holidays/ch
+* holidays/cl
 * holidays/cz
 * holidays/de
 * holidays/dk
+* holidays/ecb_target
 * holidays/el
 * holidays/es
 * holidays/europe
@@ -25,6 +27,7 @@ The following definition files are included in this installation:
 * holidays/it
 * holidays/jp
 * holidays/li
+* holidays/lt
 * holidays/ma
 * holidays/mx
 * holidays/nerc
@@ -38,8 +41,12 @@ The following definition files are included in this installation:
 * holidays/ro
 * holidays/scandinavia
 * holidays/se
+* holidays/sg
+* holidays/si
+* holidays/sk
 * holidays/united_nations
 * holidays/ups
 * holidays/us
 * holidays/ve
+* holidays/vi
 * holidays/za

data/lib/holidays/au.rb

@@ -13,22 +13,22 @@ module Holidays
   # All the definitions are available at https://github.com/alexdunae/holidays
   module AU # :nodoc:
     def self.defined_regions
-      [:au, :au_nsw, :au_tas, :au_wa, :au_vic, :au_qld, :au_nt, :au_act, :au_sa, :au_qld_brisbane]
+      [:au, :au_nsw, :au_vic, :au_qld, :au_nt, :au_act, :au_sa, :au_qld_brisbane, :au_tas, :au_wa]
     end
 
     def self.holidays_by_month
       {
               0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:au]},
-            {:function => lambda { |year| Holidays.easter(year)-1 }, :function_id => "easter(year)-1", :name => "Easter Saturday", :regions => [:au]},
+            {:function => lambda { |year| Holidays.easter(year)-1 }, :function_id => "easter(year)-1", :name => "Easter Saturday", :regions => [:au_nsw, :au_vic, :au_qld, :au_nt, :au_act, :au_sa, :au_qld_brisbane]},
             {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Easter Sunday", :regions => [:au_nsw]},
             {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Easter Monday", :regions => [:au]},
             {:function => lambda { |year| Holidays.easter(year)+2 }, :function_id => "easter(year)+2", :name => "Easter Monday", :regions => [:au_tas]}],
-      1 => [{:mday => 1, :name => "New Year's Day", :regions => [:au]},
-            {:mday => 26, :name => "Australia Day", :regions => [:au]}],
+      1 => [{:mday => 1, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "New Year's Day", :regions => [:au]},
+            {:mday => 26, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "Australia Day", :regions => [:au]}],
       3 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_wa]},
             {:wday => 1, :week => 2, :name => "Eight Hours Day", :regions => [:au_tas]},
             {:wday => 1, :week => 2, :name => "Labour Day", :regions => [:au_vic]}],
-      4 => [{:mday => 25, :name => "ANZAC Day", :regions => [:au]}],
+      4 => [{:mday => 25, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "ANZAC Day", :regions => [:au]}],
       5 => [{:function => lambda { |year| Holidays.qld_labour_day_may(year) }, :function_id => "qld_labour_day_may(year)", :name => "Labour Day", :regions => [:au_qld]},
             {:wday => 1, :week => 1, :name => "May Day", :regions => [:au_nt]}],
       6 => [{:wday => 1, :week => 1, :name => "Foundation Day", :regions => [:au_wa]},
@@ -36,10 +36,10 @@ module Holidays
             {:mday => 6, :type => :informal, :name => "Queensland Day", :regions => [:au_qld]}],
       8 => [{:wday => 3, :week => -3, :name => "Ekka", :regions => [:au_qld_brisbane]}],
       10 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_act, :au_nsw, :au_sa]},
-            {:function => lambda { |year| Holidays.qld_labour_day_october(year) }, :function_id => "qld_labour_day_october(year)", :name => "Labour Day", :regions => [:au_qld]},
-            {:function => lambda { |year| Holidays.qld_queens_bday_october(year) }, :function_id => "qld_queens_bday_october(year)", :name => "Queen's Birthday", :regions => [:au_qld]}],
-      12 => [{:mday => 25, :name => "Christmas Day", :regions => [:au]},
-            {:mday => 26, :name => "Boxing Day", :regions => [:au]}]
+            {:function => lambda { |year| Holidays.qld_labour_day_october(year) }, :function_id => "qld_labour_day_october(year)", :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "Labour Day", :regions => [:au_qld]},
+            {:function => lambda { |year| Holidays.qld_queens_bday_october(year) }, :function_id => "qld_queens_bday_october(year)", :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "Queen's Birthday", :regions => [:au_qld]}],
+      12 => [{:mday => 25, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "Christmas Day", :regions => [:au]},
+            {:mday => 26, :observed => lambda { |date| Holidays.to_weekday_if_boxing_weekend(date) }, :observed_id => "to_weekday_if_boxing_weekend", :name => "Boxing Day", :regions => [:au]}]
       }
     end
   end

data/lib/holidays/cl.rb

@@ -0,0 +1,43 @@
+# encoding: utf-8
+module Holidays
+  # This file is generated by the Ruby Holidays gem.
+  #
+  # Definitions loaded: data/cl.yaml
+  #
+  # To use the definitions in this file, load it right after you load the 
+  # Holiday gem:
+  #
+  #   require 'holidays'
+  #   require 'holidays/cl'
+  #
+  # All the definitions are available at https://github.com/alexdunae/holidays
+  module CL # :nodoc:
+    def self.defined_regions
+      [:cl]
+    end
+
+    def self.holidays_by_month
+      {
+              0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Viernes Santo", :regions => [:cl]},
+            {:function => lambda { |year| Holidays.easter(year)-1 }, :function_id => "easter(year)-1", :name => "Sábado Santo", :regions => [:cl]}],
+      1 => [{:mday => 1, :name => "Año Nuevo", :regions => [:cl]}],
+      5 => [{:mday => 1, :name => "Día del Trabajo", :regions => [:cl]},
+            {:mday => 21, :name => "Día de las Glorias Navales", :regions => [:cl]}],
+      6 => [{:mday => 29, :name => "San Pedro y San Pablo", :regions => [:cl]}],
+      7 => [{:mday => 16, :name => "Día de la Virgen del Carmen", :regions => [:cl]}],
+      8 => [{:mday => 15, :name => "Asunción de la Virgen", :regions => [:cl]}],
+      9 => [{:mday => 18, :name => "Independencia Nacional", :regions => [:cl]},
+            {:mday => 19, :name => "Día de las Glorias del Ejército", :regions => [:cl]}],
+      10 => [{:mday => 12, :name => "Encuentro de Dos Mundos", :regions => [:cl]},
+            {:mday => 31, :name => "Día de las Iglesias Evangélicas y Protestantes", :regions => [:cl]}],
+      11 => [{:mday => 1, :name => "Día de Todos los Santos", :regions => [:cl]}],
+      12 => [{:mday => 8, :name => "Inmaculada Concepción de María", :regions => [:cl]},
+            {:mday => 25, :name => "Navidad", :regions => [:cl]}]
+      }
+    end
+  end
+
+
+end
+
+Holidays.merge_defs(Holidays::CL.defined_regions, Holidays::CL.holidays_by_month)

data/lib/holidays/de.rb

@@ -13,7 +13,7 @@ module Holidays
   # All the definitions are available at https://github.com/alexdunae/holidays
   module DE # :nodoc:
     def self.defined_regions
-      [:de, :de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_st, :de_bb, :de_mv, :de_sn, :de_th]
+      [:de, :de_bw, :de_by, :de_be, :de_bb, :de_hb, :de_hh, :de_he, :de_mv, :de_ni, :de_nw, :de_rp, :de_sl, :de_sn, :de_st, :de_sh, :de_th]
     end
 
     def self.holidays_by_month

data/lib/holidays/dk.rb

@@ -34,12 +34,12 @@ module Holidays
             {: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]},
+      6 => [{:mday => 5, :type => :informal, :name => "Grundlovsdag", :regions => [:dk]},
             {:mday => 15, :type => :informal, :name => "Valdemarsdag og Genforeningsdag", :regions => [:dk]},
             {:mday => 23, :type => :informal, :name => "Sankt Hans aften", :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 => 24, :type => :informal, :name => "Juleaftensdag", :regions => [:dk]},
             {:mday => 25, :name => "1. juledag", :regions => [:dk]},
             {:mday => 26, :name => "2. juledag", :regions => [:dk]}]
       }

data/lib/holidays/ecb_target.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+module Holidays
+  # This file is generated by the Ruby Holidays gem.
+  #
+  # Definitions loaded: data/ecb_target.yaml
+  #
+  # To use the definitions in this file, load it right after you load the 
+  # Holiday gem:
+  #
+  #   require 'holidays'
+  #   require 'holidays/ecb_target'
+  #
+  # All the definitions are available at https://github.com/alexdunae/holidays
+  module ECB_TARGET # :nodoc:
+    def self.defined_regions
+      [:ecb_target]
+    end
+
+    def self.holidays_by_month
+      {
+              0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:ecb_target]},
+            {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Easter Monday", :regions => [:ecb_target]}],
+      1 => [{:mday => 1, :name => "New Year's Day", :regions => [:ecb_target]}],
+      5 => [{:mday => 1, :name => "Labour Day", :regions => [:ecb_target]}],
+      12 => [{:mday => 25, :name => "Christmas Day", :regions => [:ecb_target]},
+            {:mday => 26, :name => "Christmas Holiday", :regions => [:ecb_target]}]
+      }
+    end
+  end
+
+
+end
+
+Holidays.merge_defs(Holidays::ECB_TARGET.defined_regions, Holidays::ECB_TARGET.holidays_by_month)

data/lib/holidays/es.rb

@@ -13,40 +13,40 @@ module Holidays
   # All the definitions are available at https://github.com/alexdunae/holidays
   module ES # :nodoc:
     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]
+      [:es_pv, :es_ct, :es_na, :es_v, :es_vc, :es_an, :es, :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
 
     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]},
+              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, :es_an]},
             {: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]}],
-      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]}],
-      7 => [{:mday => 23, :name => "Santiago Apostol", :regions => [:es_ga]}],
-      8 => [{:mday => 15, :name => "Asunción", :regions => [:es]}],
-      9 => [{:mday => 2, :name => "Día de Ceuta", :regions => [:es_ce]},
-            {:mday => 8, :name => "Día de Asturias", :regions => [:es_o]},
+      1 => [{:mday => 1, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Año Nuevo", :regions => [:es]},
+            {:mday => 6, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de Reyes", :regions => [:es]}],
+      2 => [{:mday => 28, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de Andalucía", :regions => [:es_an]}],
+      3 => [{:mday => 1, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de las Islas Baleares", :regions => [:es_ib]},
+            {:mday => 19, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "San José", :regions => [:es_v, :es_vc, :es_cm, :es_mu, :es_m]}],
+      4 => [{:mday => 23, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "San Jorge", :regions => [:es_ar, :es_cl]},
+            {:mday => 23, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de Aragón", :regions => [:es_ar]}],
+      5 => [{:mday => 1, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día del Trabajador", :regions => [:es]},
+            {:mday => 2, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Fiesta de la Comunidad", :regions => [:es_m]},
+            {:mday => 30, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de las Canarias", :regions => [:es_cn]},
+            {:mday => 31, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de la Región Castilla-La Mancha", :regions => [:es_cm]}],
+      6 => [{:mday => 9, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de la Región de Murcia", :regions => [:es_mu]},
+            {:mday => 9, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de La Rioja", :regions => [:es_lo]}],
+      7 => [{:mday => 23, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Santiago Apostol", :regions => [:es_ga]}],
+      8 => [{:mday => 15, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Asunción", :regions => [:es]}],
+      9 => [{:mday => 2, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de Ceuta", :regions => [:es_ce]},
+            {:mday => 8, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :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]}],
-      10 => [{:mday => 9, :name => "Día de Valencia", :regions => [:es_vc, :es_v]},
-            {: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]}]
+            {:mday => 11, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Fiesta Nacional de Cataluña", :regions => [:es_ct]}],
+      10 => [{:mday => 9, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de Valencia", :regions => [:es_vc, :es_v]},
+            {:mday => 12, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de la Hispanidad", :regions => [:es]}],
+      11 => [{:mday => 1, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Todos los Santos", :regions => [:es]}],
+      12 => [{:mday => 6, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de la Constitución", :regions => [:es]},
+            {:mday => 8, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Inmaculada Concepción", :regions => [:es]},
+            {:mday => 25, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Navidad del Señor", :regions => [:es]},
+            {:mday => 26, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "San Esteban", :regions => [:es_ib, :es_ct]}]
       }
     end
   end

data/lib/holidays/europe.rb

@@ -2,7 +2,7 @@
 module Holidays
   # This file is generated by the Ruby Holidays gem.
   #
-  # Definitions loaded: data/at.yaml, data/be.yaml, data/ch.yaml, data/cz.yaml, data/dk.yaml, data/de.yaml, data/el.yaml, data/es.yaml, data/fr.yaml, data/gb.yaml, data/hr.yaml, data/hu.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, data/ro.yaml, data/sk.yaml
+  # Definitions loaded: data/at.yaml, data/be.yaml, data/ch.yaml, data/cz.yaml, data/dk.yaml, data/de.yaml, data/el.yaml, data/es.yaml, data/fr.yaml, data/gb.yaml, data/hr.yaml, data/hu.yaml, data/ie.yaml, data/is.yaml, data/it.yaml, data/li.yaml, data/lt.yaml, data/nl.yaml, data/no.yaml, data/pl.yaml, data/pt.yaml, data/ro.yaml, data/sk.yaml, data/si.yaml
   #
   # To use the definitions in this file, load it right after you load the 
   # Holiday gem:
@@ -13,7 +13,7 @@ module Holidays
   # All the definitions are available at https://github.com/alexdunae/holidays
   module Europe # :nodoc:
     def self.defined_regions
-      [:at, :ch_zh, :ch_be, :ch_lu, :ch_ur, :ch_sz, :ch_ow, :ch_nw, :ch_gl, :ch_zg, :ch_fr, :ch_so, :ch_bs, :ch_bl, :ch_sh, :ch_ar, :ch_ai, :ch_sg, :ch_gr, :ch_ag, :ch_tg, :ch_ti, :ch_vd, :ch_vs, :ch_ge, :ch_ju, :de, :li, :ch_ne, :de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_st, :be, :gb_eng, :gb_wls, :gb_eaw, :gb_nir, :ie, :fr, :ch, :cz, :dk, :no, :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, :gb, :gb_sct, :gb_con, :je, :gb_jsy, :gg, :gb_gsy, :im, :gb_iom, :hr, :hu, :is, :it, :nl, :pl, :pt, :ro, :sk]
+      [:at, :ch_zh, :ch_be, :ch_lu, :ch_ur, :ch_sz, :ch_ow, :ch_nw, :ch_gl, :ch_zg, :ch_fr, :ch_so, :ch_bs, :ch_bl, :ch_sh, :ch_ar, :ch_ai, :ch_sg, :ch_gr, :ch_ag, :ch_tg, :ch_ti, :ch_vd, :ch_vs, :ch_ge, :ch_ju, :de, :li, :ch_ne, :de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_st, :be, :gb_eng, :gb_wls, :gb_eaw, :gb_nir, :ie, :fr, :ch, :cz, :dk, :no, :de_bb, :de_mv, :de_sn, :de_th, :el, :es_pv, :es_ct, :es_na, :es_v, :es_vc, :es_an, :es, :es_ib, :es_cm, :es_mu, :es_m, :es_ar, :es_cl, :es_cn, :es_lo, :es_ga, :es_ce, :es_o, :es_ex, :gb, :gb_sct, :gb_con, :je, :gb_jsy, :gg, :gb_gsy, :im, :gb_iom, :hr, :hu, :is, :it, :lt, :nl, :pl, :pt, :ro, :sk, :si]
     end
 
     def self.holidays_by_month
@@ -48,12 +48,12 @@ module Holidays
             {:function => lambda { |year| Holidays.orthodox_easter(year)+1 }, :function_id => "orthodox_easter(year)+1", :name => "Δευτέρα του Πάσχα", :regions => [:el]},
             {:function => lambda { |year| Holidays.orthodox_easter(year)-48 }, :function_id => "orthodox_easter(year)-48", :name => "Καθαρά Δευτέρα", :regions => [:el]},
             {:function => lambda { |year| Holidays.orthodox_easter(year)+50 }, :function_id => "orthodox_easter(year)+50", :name => "Αγίου Πνεύματος", :regions => [:el]},
-            {: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)-3 }, :function_id => "easter(year)-3", :name => "Jueves Santo", :regions => [:es_pv, :es_ct, :es_na, :es_v, :es_vc, :es_an]},
             {: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]},
-            {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Pâques", :regions => [:fr]},
+            {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :type => :informal, :name => "Pâques", :regions => [:fr]},
             {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Lundi de Pâques", :regions => [:fr]},
-            {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "Pentecôte", :regions => [:fr]},
+            {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :type => :informal, :name => "Pentecôte", :regions => [:fr]},
             {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "Lundi de Pentecôte", :regions => [:fr]},
             {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:gb]},
             {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Easter Sunday", :regions => [:gb]},
@@ -77,6 +77,8 @@ module Holidays
             {: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) }, :function_id => "easter(year)", :name => "Šv. Velykos", :regions => [:lt]},
+            {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Antroji Velykų diena", :regions => [:lt]},
             {: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]},
@@ -106,7 +108,10 @@ module Holidays
             {:function => lambda { |year| Holidays.orthodox_easter(year) + 49 }, :function_id => "orthodox_easter(year) + 49", :name => "Rusaliile", :regions => [:ro]},
             {:function => lambda { |year| Holidays.orthodox_easter(year) + 50 }, :function_id => "orthodox_easter(year) + 50", :name => "Rusaliile", :regions => [:ro]},
             {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Veľkonočný pondelok", :regions => [:sk]},
-            {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Veľký piatok", :regions => [:sk]}],
+            {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Veľký piatok", :regions => [:sk]},
+            {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "velikonočna nedelja", :regions => [:si]},
+            {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "velikonočni ponedeljek", :regions => [:si]},
+            {:function => lambda { |year| Holidays.easter(year)+49 }, :function_id => "easter(year)+49", :name => "binkošti", :regions => [:si]}],
       1 => [{:mday => 1, :name => "Neujahrstag", :regions => [:at, :ch_zh, :ch_be, :ch_lu, :ch_ur, :ch_sz, :ch_ow, :ch_nw, :ch_gl, :ch_zg, :ch_fr, :ch_so, :ch_bs, :ch_bl, :ch_sh, :ch_ar, :ch_ai, :ch_sg, :ch_gr, :ch_ag, :ch_tg, :ch_vd, :ch_vs, :ch_ne, :ch_ge, :ch_ju, :ch_ti, :de, :li]},
             {:mday => 6, :name => "Heilige Drei Könige", :regions => [:at, :de_bw, :de_by, :de_st, :li, :li]},
             {:mday => 1, :name => "New Year's Day", :regions => [:be]},
@@ -116,11 +121,11 @@ module Holidays
             {:mday => 1, :name => "Nytårsdag", :regions => [:dk]},
             {:mday => 1, :name => "Πρωτοχρονιά", :regions => [:el]},
             {:mday => 6, :name => "Θεοφάνεια", :regions => [:el]},
-            {:mday => 1, :name => "Año Nuevo", :regions => [:es]},
-            {:mday => 6, :name => "Día de Reyes", :regions => [:es]},
+            {:mday => 1, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Año Nuevo", :regions => [:es]},
+            {:mday => 6, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de Reyes", :regions => [:es]},
             {:mday => 1, :name => "Jour de l'an", :regions => [:fr]},
             {:mday => 1, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "New Year's Day", :regions => [:gb, :ie]},
-            {:mday => 2, :name => "New Year's", :regions => [:gb_sct]},
+            {:mday => 2, :observed => lambda { |date| Holidays.to_weekday_if_boxing_weekend(date) }, :observed_id => "to_weekday_if_boxing_weekend", :name => "2nd January", :regions => [:gb_sct]},
             {:mday => 1, :name => "Nova godina", :regions => [:hr]},
             {:mday => 6, :name => "Sveta tri kralja", :regions => [:hr]},
             {:mday => 1, :name => "Újév", :regions => [:hu]},
@@ -129,6 +134,7 @@ module Holidays
             {:mday => 19, :type => :informal, :name => "Bóndadagur", :regions => [:is]},
             {:mday => 1, :name => "Capodanno", :regions => [:it]},
             {:mday => 6, :name => "Epifania", :regions => [:it]},
+            {:mday => 1, :name => "Naujieji metai", :regions => [:lt]},
             {:mday => 1, :name => "Nieuwjaar", :regions => [:nl]},
             {:mday => 1, :name => "Nyttårsdag", :regions => [:no]},
             {:mday => 1, :name => "Nowy Rok", :regions => [:pl]},
@@ -139,7 +145,8 @@ module Holidays
             {:mday => 1, :name => "Ano Novo", :regions => [:pt]},
             {:mday => 1, :name => "Anul nou", :regions => [:ro]},
             {:mday => 2, :name => "Anul nou", :regions => [:ro]},
-            {:mday => 1, :name => "Nový rok", :regions => [:sk]}],
+            {:mday => 1, :name => "Nový rok", :regions => [:sk]},
+            {:mday => 1, :name => "novo leto", :regions => [:si]}],
       5 => [{:mday => 1, :name => "Staatsfeiertag", :regions => [:at]},
             {:mday => 1, :name => "Labour Day", :regions => [:be]},
             {:mday => 1, :name => "Tag der Arbeit", :regions => [:ch_zh, :ch_bs, :ch_bl, :ch_sh, :ch_ag, :ch_tg, :ch_ti, :ch_ne, :ch_ju, :de, :li]},
@@ -148,10 +155,10 @@ module Holidays
             {:mday => 1, :name => "Arbejdernes kampdag", :regions => [:dk]},
             {:mday => 5, :type => :informal, :name => "Danmarks befrielse", :regions => [:dk]},
             {: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, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día del Trabajador", :regions => [:es]},
+            {:mday => 2, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Fiesta de la Comunidad", :regions => [:es_m]},
+            {:mday => 30, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de las Canarias", :regions => [:es_cn]},
+            {:mday => 31, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :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]},
@@ -162,6 +169,7 @@ module Holidays
             {:mday => 1, :name => "Verkalýðsdagurinn", :regions => [:is]},
             {:mday => 13, :name => "Mæðradagurinn", :regions => [:is]},
             {:mday => 1, :name => "Festa dei Lavoratori", :regions => [:it]},
+            {:mday => 1, :name => "Darbininkų diena", :regions => [:lt]},
             {:mday => 4, :name => "Dodenherdenking", :regions => [:nl]},
             {:mday => 5, :name => "Bevrijdingsdag", :regions => [:nl]},
             {:mday => 1, :name => "1. mai", :regions => [:no]},
@@ -172,12 +180,14 @@ module Holidays
             {:mday => 1, :name => "Dia do Trabalhador", :regions => [:pt]},
             {:mday => 1, :name => "Ziua muncii", :regions => [:ro]},
             {:mday => 1, :name => "Sviatok práce", :regions => [:sk]},
-            {:mday => 8, :name => "Deň víťazstva", :regions => [:sk]}],
+            {:mday => 8, :name => "Deň víťazstva", :regions => [:sk]},
+            {:mday => 1, :name => "praznik dela", :regions => [:si]},
+            {:mday => 2, :name => "praznik dela", :regions => [:si]}],
       8 => [{:mday => 15, :name => "Mariä Himmelfahrt", :regions => [:at, :ch_lu, :ch_ur, :ch_sz, :ch_ow, :ch_nw, :ch_zg, :ch_fr, :ch_so, :ch_ai, :ch_ag, :ch_ti, :ch_vs, :ch_ju, :de_by, :de_sl]},
             {:mday => 15, :name => "Assumption of Mary", :regions => [:be]},
             {:mday => 1, :name => "Bundesfeiertag", :regions => [:ch]},
             {:mday => 15, :name => "Κοίμηση της Θεοτόκου", :regions => [:el]},
-            {:mday => 15, :name => "Asunción", :regions => [:es]},
+            {:mday => 15, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Asunción", :regions => [:es]},
             {:mday => 15, :name => "Assomption", :regions => [:fr]},
             {:wday => 1, :week => 1, :name => "Bank Holiday", :regions => [:gb_sct]},
             {:wday => 1, :week => -1, :name => "Bank Holiday", :regions => [:gb_eng, :gb_wls, :gb_eaw, :gb_nir]},
@@ -188,43 +198,49 @@ module Holidays
             {: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 => "Žolinė", :regions => [:lt]},
             {: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]},
             {:mday => 15, :name => "Adormirea Maicii Domnului", :regions => [:ro]},
-            {:mday => 29, :name => "Výročie Slovenského národného povstania", :regions => [:sk]}],
+            {:mday => 29, :name => "Výročie Slovenského národného povstania", :regions => [:sk]},
+            {:mday => 15, :name => "Marijino vnebovzetje", :regions => [:si]}],
       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]},
+            {:mday => 9, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de Valencia", :regions => [:es_vc, :es_v]},
+            {:mday => 12, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de la Hispanidad", :regions => [:es]},
             {:mday => 8, :name => "Dan neovisnosti", :regions => [:hr]},
             {:mday => 23, :name => "1956-os forradalom és szabadságharc ünnepe", :regions => [:hu]},
             {:wday => 1, :week => -1, :name => "October Bank Holiday", :regions => [:ie]},
-            {:mday => 14, :type => :informal, :name => "Dzień Nauczyciela (Dzień Edukacji Narodowej)", :regions => [:pl]}],
+            {:mday => 14, :type => :informal, :name => "Dzień Nauczyciela (Dzień Edukacji Narodowej)", :regions => [:pl]},
+            {:mday => 31, :name => "dan reformacije", :regions => [:si]}],
       11 => [{:mday => 1, :name => "Allerheiligen", :regions => [:at, :ch_lu, :ch_ur, :ch_sz, :ch_ow, :ch_nw, :ch_gl, :ch_zg, :ch_fr, :ch_so, :ch_ai, :ch_sg, :ch_ag, :ch_ti, :ch_vs, :ch_ju, :de_bw, :de_by, :de_nw, :de_rp, :de_sl, :li]},
             {:mday => 1, :name => "All Saints", :regions => [:be]},
             {:mday => 11, :name => "Armistice Day", :regions => [:be]},
             {: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, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :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 => 30, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :type => :informal, :name => "St. Andrew's Day", :regions => [:gb_sct]},
             {:mday => 1, :name => "Dan svih svetih", :regions => [:hr]},
             {:mday => 1, :name => "Mindenszentek", :regions => [:hu]},
             {:mday => 16, :name => "Dagur íslenskrar tungu", :regions => [:is]},
             {:mday => 1, :name => "Ognissanti", :regions => [:it]},
+            {:mday => 1, :name => "Visų šventųjų diena", :regions => [:lt]},
             {: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 => 30, :name => "Sfântul Apostol Andrei", :regions => [:ro]},
             {:mday => 1, :name => "Sviatok všetkých svätých", :regions => [:sk]},
-            {:mday => 17, :name => "Deň boja za slobodu a demokraciu", :regions => [:sk]}],
+            {:mday => 17, :name => "Deň boja za slobodu a demokraciu", :regions => [:sk]},
+            {:mday => 1, :name => "dan spomina na mrtve", :regions => [:si]}],
       12 => [{:mday => 8, :name => "Mariä Empfägnis", :regions => [:at]},
             {:mday => 25, :name => "1. Weihnachtstag", :regions => [:at, :de]},
             {:mday => 26, :name => "2. Weihnachtstag", :regions => [:at, :de]},
@@ -237,15 +253,15 @@ module Holidays
             {:mday => 25, :name => "1. svátek vánoční", :regions => [:cz]},
             {:mday => 26, :name => "2. svátek vánoční", :regions => [:cz]},
             {:mday => 13, :type => :informal, :name => "Sankt Lucia", :regions => [:dk]},
-            {:mday => 24, :name => "Juleaftensdag", :regions => [:dk]},
+            {:mday => 24, :type => :informal, :name => "Juleaftensdag", :regions => [:dk]},
             {:mday => 25, :name => "1. juledag", :regions => [:dk, :no]},
             {:mday => 26, :name => "2. juledag", :regions => [:dk, :no]},
             {:mday => 25, :name => "Χριστούγεννα", :regions => [:el]},
             {:mday => 26, :name => "Δεύτερη ημέρα των Χριστουγέννων", :regions => [:el]},
-            {: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]},
+            {:mday => 6, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de la Constitución", :regions => [:es]},
+            {:mday => 8, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Inmaculada Concepción", :regions => [:es]},
+            {:mday => 25, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Navidad del Señor", :regions => [:es]},
+            {:mday => 26, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "San Esteban", :regions => [:es_ib, :es_ct]},
             {:mday => 25, :name => "Noël", :regions => [:fr]},
             {:mday => 25, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "Christmas Day", :regions => [:gb, :ie]},
             {:mday => 26, :observed => lambda { |date| Holidays.to_weekday_if_boxing_weekend(date) }, :observed_id => "to_weekday_if_boxing_weekend", :name => "Boxing Day", :regions => [:gb]},
@@ -263,6 +279,9 @@ module Holidays
             {:mday => 26, :name => "Santo Stefano", :regions => [:it]},
             {:mday => 24, :name => "Heilig Abend", :regions => [:li]},
             {:mday => 31, :name => "Silvester", :regions => [:li]},
+            {:mday => 24, :name => "Šv. Kūčios", :regions => [:lt]},
+            {:mday => 25, :name => "Šv. Kalėdos", :regions => [:lt]},
+            {:mday => 26, :name => "Antroji Kalėdų diena", :regions => [:lt]},
             {:mday => 5, :type => :informal, :name => "Sinterklaas", :regions => [:nl]},
             {:mday => 25, :name => "Kerstmis", :regions => [:nl]},
             {:mday => 26, :name => "Kerstmis", :regions => [:nl]},
@@ -281,70 +300,79 @@ module Holidays
             {:mday => 26, :name => "Sărbătoarea Nașterii Domnului", :regions => [:ro]},
             {:mday => 24, :name => "Štedrý deň", :regions => [:sk]},
             {:mday => 25, :name => "1. sviatok vianočný", :regions => [:sk]},
-            {:mday => 26, :name => "2. sviatek vianočný", :regions => [:sk]}],
+            {:mday => 26, :name => "2. sviatek vianočný", :regions => [:sk]},
+            {:mday => 25, :name => "božič", :regions => [:si]},
+            {:mday => 26, :name => "dan samostojnosti in enotnosti", :regions => [:si]}],
       7 => [{:mday => 21, :name => "National holiday", :regions => [:be]},
             {:mday => 5, :name => "Den slovanských věrozvěstů Cyrila a Metoděje", :regions => [:cz]},
             {:mday => 6, :name => "Den upálení mistra Jana Husa", :regions => [:cz]},
-            {:mday => 23, :name => "Santiago Apostol", :regions => [:es_ga]},
+            {:mday => 23, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Santiago Apostol", :regions => [:es_ga]},
             {: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]},
+            {:mday => 6, :name => "Valstybės diena", :regions => [:lt]},
             {:mday => 5, :name => "Sviatok svätého Cyrila a svätého Metoda", :regions => [:sk]}],
       3 => [{:mday => 1, :name => "Instauration de la République", :regions => [:ch_ne]},
             {:mday => 19, :name => "Josephstag", :regions => [:ch_ur, :ch_sz, :ch_nw, :ch_ti, :ch_vs]},
             {: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 => 1, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de las Islas Baleares", :regions => [:es_ib]},
+            {:mday => 19, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :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]},
             {:mday => 15, :name => "1848/49-es forradalom és szabadságharc ünnepe", :regions => [:hu]},
             {:mday => 17, :observed => lambda { |date| Holidays.to_monday_if_weekend(date) }, :observed_id => "to_monday_if_weekend", :name => "St. Patrick's Day", :regions => [:ie]},
             {:mday => 19, :name => "St. Josef", :regions => [:li]},
+            {:mday => 11, :name => "Nepriklausomybės atkūrimo diena", :regions => [:lt]},
             {:mday => 8, :type => :informal, :name => "Dzień Kobiet", :regions => [:pl]},
             {:mday => 10, :type => :informal, :name => "Dzień Mężczyzn", :regions => [:pl]}],
       4 => [{:function => lambda { |year| Holidays.ch_gl_naefelser_fahrt(year) }, :function_id => "ch_gl_naefelser_fahrt(year)", :name => "Näfelser Fahrt", :regions => [:ch_gl]},
             {: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 => 23, :name => "San Jorge", :regions => [:es_ar, :es_cl]},
-            {:mday => 23, :name => "Día de Aragón", :regions => [:es_ar]},
+            {:mday => 23, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "San Jorge", :regions => [:es_ar, :es_cl]},
+            {:mday => 23, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de Aragón", :regions => [:es_ar]},
             {: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 => 27, :name => "Koningsdag", :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]}],
+            {:mday => 25, :name => "Dia da Liberdade", :regions => [:pt]},
+            {:mday => 27, :name => "dan upora proti okupatorju", :regions => [:si]}],
       6 => [{:mday => 23, :name => "Commémoration du plébiscite jurassien", :regions => [:ch_ju]},
             {:mday => 29, :name => "San Pietro e Paolo", :regions => [:ch_ti]},
-            {:mday => 5, :name => "Grundlovsdag", :regions => [:dk]},
+            {:mday => 5, :type => :informal, :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]},
+            {:mday => 9, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de la Región de Murcia", :regions => [:es_mu]},
+            {:mday => 9, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de La Rioja", :regions => [:es_lo]},
             {:mday => 22, :name => "Dan antifašističke borbe", :regions => [:hr]},
             {:mday => 25, :name => "Dan državnosti", :regions => [:hr]},
             {:wday => 1, :week => 1, :name => "June 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 => 24, :name => "Joninės", :regions => [:lt]},
             {:mday => 23, :type => :informal, :name => "Dzień Ojca", :regions => [:pl]},
-            {:mday => 10, :name => "Dia de Portugal", :regions => [:pt]}],
+            {:mday => 10, :name => "Dia de Portugal", :regions => [:pt]},
+            {:mday => 25, :name => "dan državnosti", :regions => [:si]}],
       9 => [{:mday => 22, :name => "Mauritiustag", :regions => [:ch_ai]},
             {:mday => 25, :name => "Bruderklausenfest", :regions => [:ch_ow]},
             {: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 => 2, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Día de Ceuta", :regions => [:es_ce]},
+            {:mday => 8, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :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, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :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]},
             {:mday => 1, :name => "Deň Ústavy Slovenskej republiky", :regions => [:sk]},
             {:mday => 15, :name => "Sedembolestná Panna Mária", :regions => [:sk]}],
-      2 => [{:mday => 28, :name => "Día de Andalucía", :regions => [:es_an]},
+      2 => [{:mday => 28, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :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 => 16, :name => "Valstybės atkūrimo diena", :regions => [:lt]},
             {:mday => 2, :type => :informal, :name => "Ofiarowanie Pańskie (Matki Boskiej Gromnicznej)", :regions => [:pl]},
-            {:mday => 14, :type => :informal, :name => "Dzień Zakochanych (Walentynki)", :regions => [:pl]}]
+            {:mday => 14, :type => :informal, :name => "Dzień Zakochanych (Walentynki)", :regions => [:pl]},
+            {:mday => 8, :name => "Prešernov dan, slovenski kulturni praznik", :regions => [:si]}]
       }
     end
   end