Re: [Bug-gcal] German Reformationstag 2017

[Giuseppe Scrivano]

Hi Bruno,

> Well, no, it does not fix it. The change to hd-data1.c does not have the 
> desired
> effect.
>
> $ for land in BW BY BE BB HB HH HE MV NI NW RP SL SN ST SH TH ; do ./gcal -q 
> DE_$land -N 2017 | grep 'Reformationstag' ; done

I have used your same script and I get this:

$ for land in BW BY BE BB HB HH HE MV NI NW RP SL SN ST SH TH ; do 
LANGUAGE=de_de src/gcal  -q DE_$land -N 2016 | grep 'Reformationstag'  ; done

Reformationstag (DE_BB)                  + Mo, :31:Okt 2016 = +242 Tage
Reformationstag (DE_MV)                  + Mo, :31:Okt 2016 = +242 Tage
Reformationstag (DE_ST)                  + Mo, :31:Okt 2016 = +242 Tage
Reformationstag (DE_TH)                  + Mo, :31:Okt 2016 = +242 Tage


With this other version of the patch, I fix (at least it works here)
also the other bug you reported about DE_SN:

$ for land in BW BY BE BB HB HH HE MV NI NW RP SL SN ST SH TH ; do 
LANGUAGE=de_de src/gcal  -q DE_$land -N 2016 | grep 'Reformationstag'  ; done
Reformationstag (DE_BB)                  + Mo, :31:Okt 2016 = +242 Tage
Reformationstag (DE_MV)                  + Mo, :31:Okt 2016 = +242 Tage
Reformationstag (DE_SN)                  + Mo, :31:Okt 2016 = +242 Tage
Reformationstag (DE_ST)                  + Mo, :31:Okt 2016 = +242 Tage
Reformationstag (DE_TH)                  + Mo, :31:Okt 2016 = +242 Tage

Do you get the output in german?  Could you please double check it?

Thanks,
Giuseppe


diff --git a/src/hd-data1.c b/src/hd-data1.c
index 56c26a7..c363947 100644
--- a/src/hd-data1.c
+++ b/src/hd-data1.c
@@ -649,6 +649,10 @@ de_hdy (init_data, detected, easter, year, hd_elems, fday, 
count)
           "+", DAY_MIN, 5, year, hd_elems, fday, count);
   base_christian_hdy (init_data, detected, easter, year, hd_elems, fday,
                      count);
+  if (year == 2017)
+    holiday (*init_data, detected, _(hd_text[HD_REFORMATION_DAY].ht_text),
+            ptr_cc_id, "+", dvec[10 - 1], 10, year, hd_elems, fday,
+            count);
 }
 
 
diff --git a/src/hd-data3.c b/src/hd-data3.c
index e2cb622..b8dbb5f 100644
--- a/src/hd-data3.c
+++ b/src/hd-data3.c
@@ -106,7 +106,7 @@ de_bb_hdy (init_data, detected, easter, year, hd_elems, 
fday, count)
     }
   else
     de_hdy (init_data, detected, easter, year, hd_elems, fday, count);
-  if (year > 1516)
+  if (year > 1516 && year != 2017)
     holiday (*init_data, detected, _(hd_text[HD_REFORMATION_DAY].ht_text),
             ptr_cc_id, "+", dvec[10 - 1], 10, year, hd_elems, fday, count);
   if (year > 1989)
@@ -438,10 +438,9 @@ de_sn_hdy (init_data, detected, easter, year, hd_elems, 
fday, count)
   holiday (*init_data, detected,
           _(hd_text[HD_DAY_OF_PRAYER_AND_REPENTANCE].ht_text), ptr_cc_id,
           "+", day, 11, year, hd_elems, fday, count);
-  if (year > 1516)
+  if (year > 1516 && year != 2017)
     holiday (*init_data, detected, _(hd_text[HD_REFORMATION_DAY].ht_text),
-            ptr_cc_id, DIS_HLS_PREF2, dvec[10 - 1], 10, year, hd_elems, fday,
-            count);
+            ptr_cc_id, "+", dvec[10 - 1], 10, year, hd_elems, fday, count);
   if (year > 1989)
     holiday (*init_data, detected, _(hd_text[HD_GERMAN_UNITY_DAY].ht_text),
             ptr_cc_id, "+", 3, 10, year, hd_elems, fday, count);