Issue-144: fix definition method naming mistakes picked up during reb…

…ase to latest master
Qqwy · Apr 17, 2016 · 9e65aa3 · 9e65aa3
1 parent d190f57
commit 9e65aa3
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 18 deletions.
diff --git a/definitions/be_nl.yaml b/definitions/be_nl.yaml
@@ -11,16 +11,20 @@ months:
     function: easter(year)
   - name: Paasmaandag
     regions: [be_nl]
-    function: easter(year)+1
+    function: easter(year)
+    function_modifier: 1
   - name: O.H. Hemelvaart
     regions: [be_nl]
-    function: easter(year)+39
+    function: easter(year)
+    function_modifier: 39
   - name: Pinksteren
     regions: [be_nl]
-    function: easter(year)+49
+    function: easter(year)
+    function_modifier: 49
   - name: Pinkstermaandag
     regions: [be_nl]
-    function: easter(year)+50
+    function: easter(year)
+    function_modifier: 50
   1:
   - name: Nieuwjaar
     regions: [be_nl]

diff --git a/definitions/de.yaml b/definitions/de.yaml
@@ -18,7 +18,7 @@ months:
   0:
   - name: Karfreitag
     regions: [de]
-    function: easter(year)-2
+    function: easter(year)
     function_modifier: -2
   - name: Ostersonntag
     regions: [de]
@@ -34,7 +34,7 @@ months:
     function_modifier: 39
   - name: Pfingstsonntag
     regions: [de]
-    function: easter(year)+49
+    function: easter(year)
     function_modifier: 49
     type: informal
   - name: Pfingstmontag

diff --git a/lib/generated_definitions/be_nl.rb b/lib/generated_definitions/be_nl.rb
@@ -19,10 +19,10 @@ def self.defined_regions
     def self.holidays_by_month
       {
               0 => [{:function => "easter(year)", :function_arguments => [:year], :name => "Pasen", :regions => [:be_nl]},
-            {:function => "easter(year)+1", :function_arguments => , :name => "Paasmaandag", :regions => [:be_nl]},
-            {:function => "easter(year)+39", :function_arguments => , :name => "O.H. Hemelvaart", :regions => [:be_nl]},
-            {:function => "easter(year)+49", :function_arguments => , :name => "Pinksteren", :regions => [:be_nl]},
-            {:function => "easter(year)+50", :function_arguments => , :name => "Pinkstermaandag", :regions => [:be_nl]}],
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Paasmaandag", :regions => [:be_nl]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 39, :name => "O.H. Hemelvaart", :regions => [:be_nl]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 49, :name => "Pinksteren", :regions => [:be_nl]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 50, :name => "Pinkstermaandag", :regions => [:be_nl]}],
       1 => [{:mday => 1, :name => "Nieuwjaar", :regions => [:be_nl]}],
       5 => [{:mday => 1, :name => "Feest van de Arbeid", :regions => [:be_nl]}],
       7 => [{:mday => 21, :name => "Nationale Feestdag", :regions => [:be_nl]}],

diff --git a/lib/generated_definitions/de.rb b/lib/generated_definitions/de.rb
@@ -18,11 +18,11 @@ def self.defined_regions
 
     def self.holidays_by_month
       {
-              0 => [{:function => "easter(year)-2", :function_arguments => , :function_modifier => -2, :name => "Karfreitag", :regions => [:de]},
+              0 => [{:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Karfreitag", :regions => [:de]},
             {:function => "easter(year)", :function_arguments => [:year], :type => :informal, :name => "Ostersonntag", :regions => [:de]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Ostermontag", :regions => [:de]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 39, :name => "Christi Himmelfahrt", :regions => [:de]},
-            {:function => "easter(year)+49", :function_arguments => , :function_modifier => 49, :type => :informal, :name => "Pfingstsonntag", :regions => [:de]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 49, :type => :informal, :name => "Pfingstsonntag", :regions => [:de]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 50, :name => "Pfingstmontag", :regions => [:de]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 60, :name => "Fronleichnam", :regions => [:de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn_aux, :de_th_aux]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -52, :type => :informal, :name => "Weiberfastnacht", :regions => [:de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn]},

diff --git a/lib/generated_definitions/europe.rb b/lib/generated_definitions/europe.rb
@@ -28,10 +28,10 @@ def self.holidays_by_month
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 49, :name => "Pentecôte", :regions => [:be_fr]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 50, :name => "Lundi de Pentecôte", :regions => [:be_fr]},
             {:function => "easter(year)", :function_arguments => [:year], :name => "Pasen", :regions => [:be_nl]},
-            {:function => "easter(year)+1", :function_arguments => , :name => "Paasmaandag", :regions => [:be_nl]},
-            {:function => "easter(year)+39", :function_arguments => , :name => "O.H. Hemelvaart", :regions => [:be_nl]},
-            {:function => "easter(year)+49", :function_arguments => , :name => "Pinksteren", :regions => [:be_nl]},
-            {:function => "easter(year)+50", :function_arguments => , :name => "Pinkstermaandag", :regions => [:be_nl]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Paasmaandag", :regions => [:be_nl]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 39, :name => "O.H. Hemelvaart", :regions => [:be_nl]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 49, :name => "Pinksteren", :regions => [:be_nl]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 50, :name => "Pinkstermaandag", :regions => [:be_nl]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Karfreitag", :regions => [: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_ne, :ch_ge, :ch_ju]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Ostermontag", :regions => [: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]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 39, :name => "Auffahrt", :regions => [:ch]},
@@ -51,11 +51,11 @@ def self.holidays_by_month
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 39, :name => "Kristi Himmelfartsdag", :regions => [:dk]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 49, :name => "Pinsedag", :regions => [:dk]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 50, :name => "2. Pinsedag", :regions => [:dk]},
-            {:function => "easter(year)-2", :function_arguments => , :function_modifier => -2, :name => "Karfreitag", :regions => [:de]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -2, :name => "Karfreitag", :regions => [:de]},
             {:function => "easter(year)", :function_arguments => [:year], :type => :informal, :name => "Ostersonntag", :regions => [:de]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 1, :name => "Ostermontag", :regions => [:de]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 39, :name => "Christi Himmelfahrt", :regions => [:de]},
-            {:function => "easter(year)+49", :function_arguments => , :function_modifier => 49, :type => :informal, :name => "Pfingstsonntag", :regions => [:de]},
+            {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 49, :type => :informal, :name => "Pfingstsonntag", :regions => [:de]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 50, :name => "Pfingstmontag", :regions => [:de]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => 60, :name => "Fronleichnam", :regions => [:de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn_aux, :de_th_aux]},
             {:function => "easter(year)", :function_arguments => [:year], :function_modifier => -52, :type => :informal, :name => "Weiberfastnacht", :regions => [:de_bw, :de_by, :de_he, :de_nw, :de_rp, :de_sl, :de_sn]},