holidays 1.0.1 → 1.0.2

data/lib/holidays/au.rb

@@ -12,28 +12,28 @@ module Holidays
   #
   # More definitions are available at http://code.dunae.ca/holidays.
   module AU # :nodoc:
-    DEFINED_REGIONS = [:au, :au_tas, :au_wa, :au_vic, :au_qld, :au_nt, :au_act, :au_nsw, :au_sa, :au_qld_brisbane]
+    DEFINED_REGIONS = [:au_qld, :au_nt, :au, :au_tas, :au_wa, :au_act, :au_nsw, :au_sa, :au_vic, :au_qld_brisbane]
 
     HOLIDAYS_BY_MONTH = {
+      5 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_qld]},
+            {:wday => 1, :week => 1, :name => "May Day", :regions => [:au_nt]}],
       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 Monday", :regions => [:au]},
             {:function => lambda { |year| Holidays.easter(year)+2 }, :function_id => "easter(year)+2", :name => "Easter Monday", :regions => [:au_tas]}],
+      6 => [{:wday => 1, :week => 1, :name => "Foundation Day", :regions => [:au_wa]},
+            {:wday => 1, :week => 2, :name => "Queen's Birthday", :regions => [:au_act, :au_nsw, :au_sa, :au_tas, :au_nt, :au_qld, :au_vic]},
+            {:mday => 6, :type => :informal, :name => "Queensland Day", :regions => [:au_qld]}],
       1 => [{:mday => 1, :name => "New Year's Day", :regions => [:au]},
             {:mday => 26, :name => "Australia Day", :regions => [:au]}],
+      12 => [{:mday => 25, :name => "Christmas Day", :regions => [:au]},
+            {:mday => 26, :name => "Boxing Day", :regions => [:au]}],
+      8 => [{:wday => 3, :week => -3, :name => "Ekka", :regions => [:au_qld_brisbane]}],
       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]}],
-      5 => [{:wday => 1, :week => 1, :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]},
-            {:wday => 1, :week => 2, :name => "Queen's Birthday", :regions => [:au_act, :au_nsw, :au_sa, :au_tas, :au_nt, :au_qld, :au_vic]},
-            {: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]}],
-      12 => [{:mday => 25, :name => "Christmas Day", :regions => [:au]},
-            {:mday => 26, :name => "Boxing Day", :regions => [:au]}]
+      10 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:au_act, :au_nsw, :au_sa]}]
     }
   end
 

data/lib/holidays/br.rb

@@ -15,18 +15,18 @@ module Holidays
     DEFINED_REGIONS = [:br]
 
     HOLIDAYS_BY_MONTH = {
+      5 => [{:mday => 1, :name => "Dia do Trabalho", :regions => [:br]}],
       0 => [{:function => lambda { |year| Holidays.easter(year)-47 }, :function_id => "easter(year)-47", :type => :informal, :name => "Carnaval", :regions => [:br]},
             {:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Sexta-feira Santa", :regions => [:br]},
             {:function => lambda { |year| Holidays.easter(year) }, :function_id => "easter(year)", :name => "Páscoa", :regions => [:br]},
             {:function => lambda { |year| Holidays.easter(year)+60 }, :function_id => "easter(year)+60", :name => "Corpus Christ", :regions => [:br]}],
-      1 => [{:mday => 1, :name => "Dia da Confraternização Universal", :regions => [:br]}],
-      4 => [{:mday => 21, :name => "Dia de Tiradentes", :regions => [:br]}],
-      5 => [{:mday => 1, :name => "Dia do Trabalho", :regions => [:br]}],
-      9 => [{:mday => 7, :name => "Proclamação da Independência", :regions => [:br]}],
-      10 => [{:mday => 12, :name => "Dia de Nossa Senhora Aparecida", :regions => [:br]}],
       11 => [{:mday => 2, :name => "Dia de Finados", :regions => [:br]},
             {:mday => 15, :name => "Proclamação da República", :regions => [:br]}],
-      12 => [{:mday => 25, :name => "Natal", :regions => [:br]}]
+      1 => [{:mday => 1, :name => "Dia da Confraternização Universal", :regions => [:br]}],
+      12 => [{:mday => 25, :name => "Natal", :regions => [:br]}],
+      9 => [{:mday => 7, :name => "Proclamação da Independência", :regions => [:br]}],
+      4 => [{:mday => 21, :name => "Dia de Tiradentes", :regions => [:br]}],
+      10 => [{:mday => 12, :name => "Dia de Nossa Senhora Aparecida", :regions => [:br]}]
     }
   end
 

data/lib/holidays/ca.rb

@@ -12,42 +12,42 @@ module Holidays
   #
   # More definitions are available at http://code.dunae.ca/holidays.
   module CA # :nodoc:
-    DEFINED_REGIONS = [:ca, :ca_qc, :ca_ab, :ca_on, :ca_sk, :ca_mb, :ca_nf, :ca_nt, :ca_nu, :ca_bc, :ca_ns, :ca_yk, :us]
+    DEFINED_REGIONS = [:ca, :ca_qc, :ca_nf, :ca_nt, :ca_nu, :ca_ab, :ca_on, :ca_sk, :ca_mb, :ca_bc, :ca_ns, :ca_yk, :us]
 
     HOLIDAYS_BY_MONTH = {
-      0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:ca]},
-            {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :type => :informal, :name => "Easter Monday", :regions => [:ca]}],
-      1 => [{:mday => 1, :name => "New Year's Day", :regions => [:ca]},
-            {:mday => 2, :name => "New Year's", :regions => [:ca_qc]}],
-      2 => [{:wday => 1, :week => 3, :name => "Family Day", :regions => [:ca_ab, :ca_on, :ca_sk]},
-            {:wday => 1, :week => 3, :name => "Louis Riel Day", :regions => [:ca_mb]},
-            {:mday => 2, :type => :informal, :name => "Groundhog Day", :regions => [:us, :ca]},
-            {:mday => 14, :type => :informal, :name => "Valentine's Day", :regions => [:us, :ca]}],
-      3 => [{:mday => 23, :name => "St. George's Day", :regions => [:ca_nf]},
-            {:mday => 17, :type => :informal, :name => "St. Patrick's Day", :regions => [:us, :ca]}],
       5 => [{:function => lambda { |year| Holidays.ca_victoria_day(year) }, :function_id => "ca_victoria_day(year)", :name => "Victoria Day", :regions => [:ca]},
             {:function => lambda { |year| Holidays.ca_victoria_day(year) }, :function_id => "ca_victoria_day(year)", :name => "National Patriotes Day", :regions => [:ca_qc]},
             {:wday => 0, :week => 3, :type => :informal, :name => "Father's Day", :regions => [:us, :ca]}],
+      0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Good Friday", :regions => [:ca]},
+            {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :type => :informal, :name => "Easter Monday", :regions => [:ca]}],
+      11 => [{:mday => 11, :name => "Remembrance Day", :regions => [:ca]}],
       6 => [{:mday => 24, :name => "Discovery Day", :regions => [:ca_nf]},
             {:mday => 24, :name => "Fête Nationale", :regions => [:ca_qc]},
             {:mday => 21, :name => "National Aboriginal Day", :regions => [:ca_nt]}],
+      1 => [{:mday => 1, :name => "New Year's Day", :regions => [:ca]},
+            {:mday => 2, :name => "New Year's", :regions => [:ca_qc]}],
+      12 => [{:mday => 25, :name => "Christmas Day", :regions => [:ca]},
+            {:mday => 26, :name => "Boxing Day", :regions => [:ca]}],
       7 => [{:mday => 1, :observed => lambda { |date| Holidays.to_monday_if_sunday(date) }, :observed_id => "to_monday_if_sunday", :name => "Canada Day", :regions => [:ca]},
             {:mday => 12, :name => "Orangemen's Day", :regions => [:ca_nf]},
             {:mday => 9, :name => "Nunavut Day", :regions => [:ca_nu]}],
+      2 => [{:wday => 1, :week => 3, :name => "Family Day", :regions => [:ca_ab, :ca_on, :ca_sk]},
+            {:wday => 1, :week => 3, :name => "Louis Riel Day", :regions => [:ca_mb]},
+            {:mday => 2, :type => :informal, :name => "Groundhog Day", :regions => [:us, :ca]},
+            {:mday => 14, :type => :informal, :name => "Valentine's Day", :regions => [:us, :ca]}],
       8 => [{:wday => 1, :week => 1, :name => "BC Day", :regions => [:ca_bc]},
             {:wday => 1, :week => 1, :name => "Saskatchewan Day", :regions => [:ca_sk]},
             {:wday => 1, :week => 1, :name => "Heritage Day", :regions => [:ca_ab]},
             {:wday => 1, :week => 1, :name => "Natal Day", :regions => [:ca_ns]},
             {:wday => 1, :week => 1, :name => "Civic Holiday", :regions => [:ca_on]},
             {:wday => 1, :week => 3, :name => "Discovery Day", :regions => [:ca_yk]}],
+      3 => [{:mday => 23, :name => "St. George's Day", :regions => [:ca_nf]},
+            {:mday => 17, :type => :informal, :name => "St. Patrick's Day", :regions => [:us, :ca]}],
       9 => [{:wday => 1, :week => 1, :name => "Labour Day", :regions => [:ca]}],
-      10 => [{:wday => 1, :week => 2, :name => "Thanksgiving", :regions => [:ca]},
-            {:mday => 31, :type => :informal, :name => "Halloween", :regions => [:us, :ca]}],
-      11 => [{:mday => 11, :name => "Remembrance Day", :regions => [:ca]}],
-      12 => [{:mday => 25, :name => "Christmas Day", :regions => [:ca]},
-            {:mday => 26, :name => "Boxing Day", :regions => [:ca]}],
       4 => [{:mday => 1, :type => :informal, :name => "April Fool's Day", :regions => [:us, :ca]},
-            {:mday => 22, :type => :informal, :name => "Earth Day", :regions => [:us, :ca]}]
+            {:mday => 22, :type => :informal, :name => "Earth Day", :regions => [:us, :ca]}],
+      10 => [{:wday => 1, :week => 2, :name => "Thanksgiving", :regions => [:ca]},
+            {:mday => 31, :type => :informal, :name => "Halloween", :regions => [:us, :ca]}]
     }
   end
 

data/lib/holidays/cz.rb

@@ -15,18 +15,18 @@ module Holidays
     DEFINED_REGIONS = [:cz]
 
     HOLIDAYS_BY_MONTH = {
-      0 => [{:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Velikonoční pondělí", :regions => [:cz]}],
-      1 => [{:mday => 1, :name => "Den obnovy samostatného českého státu", :regions => [:cz]}],
       5 => [{:mday => 1, :name => "Svátek práce", :regions => [:cz]},
             {:mday => 8, :name => "Den vítězství", :regions => [:cz]}],
-      7 => [{: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]}],
-      9 => [{:mday => 28, :name => "Den české státnosti", :regions => [:cz]}],
-      10 => [{:mday => 28, :name => "Den vzniku samostatného československého státu", :regions => [:cz]}],
+      0 => [{:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Velikonoční pondělí", :regions => [:cz]}],
       11 => [{:mday => 17, :name => "Den boje za svobodu a demokracii", :regions => [:cz]}],
+      1 => [{:mday => 1, :name => "Den obnovy samostatného českého státu", :regions => [:cz]}],
       12 => [{:mday => 24, :name => "Štědrý den", :regions => [:cz]},
             {:mday => 25, :name => "1. svátek vánoční", :regions => [:cz]},
-            {:mday => 26, :name => "2. svátek vánoční", :regions => [:cz]}]
+            {:mday => 26, :name => "2. svátek vánoční", :regions => [:cz]}],
+      7 => [{: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]}],
+      9 => [{:mday => 28, :name => "Den české státnosti", :regions => [:cz]}],
+      10 => [{:mday => 28, :name => "Den vzniku samostatného československého státu", :regions => [:cz]}]
     }
   end
 

data/lib/holidays/de.rb

@@ -12,24 +12,24 @@ module Holidays
   #
   # More definitions are available at http://code.dunae.ca/holidays.
   module DE # :nodoc:
-    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]
+    DEFINED_REGIONS = [:de, :de_bw, :de_by, :de_nw, :de_rp, :de_sl, :de_sn, :de_he, :de_st, :de_bb, :de_mv, :de_th]
 
     HOLIDAYS_BY_MONTH = {
+      5 => [{:mday => 1, :name => "Tag der Arbeit", :regions => [:de]}],
       0 => [{:function => lambda { |year| Holidays.easter(year)-2 }, :function_id => "easter(year)-2", :name => "Karfreitag", :regions => [:de]},
             {:function => lambda { |year| Holidays.easter(year)+1 }, :function_id => "easter(year)+1", :name => "Ostermontag", :regions => [:de]},
             {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Christi Himmelfahrt", :regions => [:de]},
             {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "Pfingstmontag", :regions => [:de]},
             {:function => lambda { |year| Holidays.easter(year)+60 }, :function_id => "easter(year)+60", :name => "Fronleichnam", :regions => [:de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl]}],
+      11 => [{:mday => 1, :name => "Allerheiligen", :regions => [:de_bw, :de_by, :de_nw, :de_rp, :de_sl]},
+            {:function => lambda { |year| Holidays.de_buss_und_bettag(year) }, :function_id => "de_buss_und_bettag(year)", :name => "Buß- und Bettag", :regions => [:de_sn]}],
       1 => [{:mday => 1, :name => "Neujahrstag", :regions => [:de]},
             {:mday => 6, :name => "Heilige Drei Könige", :regions => [:de_bw, :de_by, :de_st]}],
-      5 => [{:mday => 1, :name => "Tag der Arbeit", :regions => [:de]}],
+      12 => [{:mday => 25, :name => "1. Weihnachtstag", :regions => [:de]},
+            {:mday => 26, :name => "2. Weihnachtstag", :regions => [:de]}],
       8 => [{:mday => 15, :name => "Mariä Himmelfahrt", :regions => [:de_by, :de_sl]}],
       10 => [{:mday => 3, :name => "Tag der Deutschen Einheit", :regions => [:de]},
-            {:mday => 31, :name => "Reformationstag", :regions => [:de_bb, :de_mv, :de_sn, :de_st, :de_th]}],
-      11 => [{:mday => 1, :name => "Allerheiligen", :regions => [:de_bw, :de_by, :de_nw, :de_rp, :de_sl]},
-            {:function => lambda { |year| Holidays.de_buss_und_bettag(year) }, :function_id => "de_buss_und_bettag(year)", :name => "Buß- und Bettag", :regions => [:de_sn]}],
-      12 => [{:mday => 25, :name => "1. Weihnachtstag", :regions => [:de]},
-            {:mday => 26, :name => "2. Weihnachtstag", :regions => [:de]}]
+            {:mday => 31, :name => "Reformationstag", :regions => [:de_bb, :de_mv, :de_sn, :de_st, :de_th]}]
     }
   end
 

data/lib/holidays/dk.rb

@@ -15,6 +15,8 @@ module Holidays
     DEFINED_REGIONS = [:dk]
 
     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]},
             {: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]},
@@ -25,20 +27,18 @@ 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]}],
-      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]}],
+      11 => [{:mday => 10, :type => :informal, :name => "Mortensaften", :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]}],
-      11 => [{:mday => 10, :type => :informal, :name => "Mortensaften", :regions => [:dk]}],
+      1 => [{:mday => 1, :name => "Nytårsdag", :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]}]
+            {: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]}]
     }
   end
 

data/lib/holidays/el.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+module Holidays
+  # This file is generated by the Ruby Holiday gem.
+  #
+  # Definitions loaded: data/el.yaml
+  #
+  # To use the definitions in this file, load them right after you load the 
+  # Holiday gem:
+  #
+  #   require 'holidays'
+  #   require 'holidays/el'
+  #
+  # More definitions are available at http://code.dunae.ca/holidays.
+  module EL # :nodoc:
+    DEFINED_REGIONS = [:el]
+
+    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]},
+            {: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]},
+            {: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]}],
+      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]}]
+    }
+  end
+
+
+end
+
+Holidays.merge_defs(Holidays::EL::DEFINED_REGIONS, Holidays::EL::HOLIDAYS_BY_MONTH)

data/lib/holidays/es.rb

@@ -12,38 +12,38 @@ module Holidays
   #
   # More definitions are available at http://code.dunae.ca/holidays.
   module ES # :nodoc:
-    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]
+    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]
 
     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]}],
-      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 => 12, :name => "Día de la Hispanidad", :regions => [:es]}]
     }
   end
 

data/lib/holidays/europe.rb

@@ -2,7 +2,7 @@
 module Holidays
   # This file is generated by the Ruby Holiday gem.
   #
-  # Definitions loaded: data/cz.yaml, data/dk.yaml, data/de.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/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
   #
   # To use the definitions in this file, load them right after you load the 
   # Holiday gem:
@@ -12,9 +12,32 @@ module Holidays
   #
   # More definitions are available at http://code.dunae.ca/holidays.
   module Europe # :nodoc:
-    DEFINED_REGIONS = [:cz, :dk, :no, :de, :de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_st, :de_bb, :de_mv, :de_sn, :de_th, :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, :pt]
+    DEFINED_REGIONS = [:cz, :dk, :no, :de, :de_bw, :de_by, :de_nw, :de_rp, :de_sl, :de_sn, :de_he, :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]
 
     HOLIDAYS_BY_MONTH = {
+      5 => [{: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 => "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]},
@@ -31,6 +54,12 @@ module Holidays
             {:function => lambda { |year| Holidays.easter(year)+39 }, :function_id => "easter(year)+39", :name => "Christi Himmelfahrt", :regions => [:de]},
             {:function => lambda { |year| Holidays.easter(year)+50 }, :function_id => "easter(year)+50", :name => "Pfingstmontag", :regions => [:de]},
             {:function => lambda { |year| Holidays.easter(year)+60 }, :function_id => "easter(year)+60", :name => "Fronleichnam", :regions => [:de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl]},
+            {: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]},
+            {: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)-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]},
@@ -69,10 +98,33 @@ module Holidays
             {: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 => 17, :name => "Den boje za svobodu a demokracii", :regions => [:cz]},
+            {:mday => 10, :type => :informal, :name => "Mortensaften", :regions => [:dk]},
+            {:mday => 1, :name => "Allerheiligen", :regions => [:de_bw, :de_by, :de_nw, :de_rp, :de_sl]},
+            {: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 => "Den obnovy samostatného českého státu", :regions => [:cz]},
             {:mday => 1, :name => "Nytårsdag", :regions => [:dk]},
             {:mday => 1, :name => "Neujahrstag", :regions => [:de]},
             {:mday => 6, :name => "Heilige Drei Könige", :regions => [:de_bw, :de_by, :de_st]},
+            {: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, :name => "Jour de l'an", :regions => [:fr]},
@@ -86,57 +138,6 @@ module Holidays
             {:mday => 1, :name => "Nieuwjaar", :regions => [:nl]},
             {:mday => 1, :name => "Nyttårsdag", :regions => [:no]},
             {:mday => 1, :name => "Ano Novo", :regions => [:pt]}],
-      5 => [{: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 => "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]}],
-      7 => [{: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 => 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]}],
-      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]}],
-      10 => [{: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 => 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]}],
-      11 => [{:mday => 17, :name => "Den boje za svobodu a demokracii", :regions => [:cz]},
-            {:mday => 10, :type => :informal, :name => "Mortensaften", :regions => [:dk]},
-            {:mday => 1, :name => "Allerheiligen", :regions => [:de_bw, :de_by, :de_nw, :de_rp, :de_sl]},
-            {: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]}],
       12 => [{:mday => 24, :name => "Štědrý den", :regions => [:cz]},
             {:mday => 25, :name => "1. svátek vánoční", :regions => [:cz]},
             {:mday => 26, :name => "2. svátek vánoční", :regions => [:cz]},
@@ -146,6 +147,8 @@ module Holidays
             {:mday => 26, :name => "2. juledag", :regions => [:dk, :no]},
             {:mday => 25, :name => "1. Weihnachtstag", :regions => [:de]},
             {:mday => 26, :name => "2. Weihnachtstag", :regions => [:de]},
+            {: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]},
@@ -170,26 +173,16 @@ module Holidays
             {:mday => 1, :name => "Restauração da Independência", :regions => [:pt]},
             {:mday => 8, :name => "Imaculada Conceição", :regions => [:pt]},
             {:mday => 25, :name => "Natal", :regions => [:pt]}],
-      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 => 23, :name => "San Jorge", :regions => [:es_ar, :es_cl]},
-            {:mday => 23, :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 => 25, :name => "Dia da Liberdade", :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]}],
+      7 => [{: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 => 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 => [: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]},
@@ -197,27 +190,36 @@ module Holidays
             {: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]}],
-      2 => [{:mday => 28, :name => "Día de Andalucía", :regions => [:es_an]},
-            {:mday => 18, :type => :informal, :name => "Konudagur", :regions => [:is]}],
-      3 => [{:mday => 1, :name => "Día de las Islas Baleares", :regions => [:es_ib]},
+      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 => 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]}],
+      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 => 23, :name => "San Jorge", :regions => [:es_ar, :es_cl]},
+            {:mday => 23, :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 => 25, :name => "Dia da Liberdade", :regions => [:pt]}],
+      10 => [{: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]}]
     }
   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)
@@ -230,6 +232,18 @@ 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
+end
+
+
 
 end