Re: [Bug-gcal] Moi Day Kenya holiday suppressed

[Giuseppe Scrivano]

Hi,

thanks for your report, I have pushed the following patch that should
address the issue you reported.

Regards,
Giuseppe

>From 3897e1edbbb5a7eb275e7547d7ff87b1d8841f3b Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <address@hidden>
Date: Wed, 19 Jul 2017 13:44:35 +0200
Subject: [PATCH] gcal: fix typo and stop Moi day when year >= 2010

Reported by: "Bob.Korn" <address@hidden>

https://en.wikipedia.org/wiki/Moi_Day

Signed-off-by: Giuseppe Scrivano <address@hidden>
---
 src/hd-data.c  | 2 +-
 src/hd-data3.c | 5 +++--
 src/hd-defs.h  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/hd-data.c b/src/hd-data.c
index 5e1da66..1996313 100644
--- a/src/hd-data.c
+++ b/src/hd-data.c
@@ -914,7 +914,7 @@ const Ht_struct hd_text[] = {
   {HD_NEVADA_DAY, N_("Nevada Day")},
   {HD_NEW_REGIME_ANNIVERSARY, N_("New Regime Anniversary")},
   {HD_NOBEL_DAY, N_("Nobel Day")},
-  {HD_NOI_DAY, N_("Noi Day")},
+  {HD_MOI_DAY, N_("Moi Day")},
   {HD_OAU_DAY, N_("OAU Day")},
   {HD_OCTOBER_HOLIDAY, N_("October Holiday")},
   {HD_OIL_INDUSTRY_DAY, N_("Oil Industry Day")},
diff --git a/src/hd-data3.c b/src/hd-data3.c
index 1ddb935..bb91be0 100644
--- a/src/hd-data3.c
+++ b/src/hd-data3.c
@@ -3001,8 +3001,9 @@ ke_hdy (init_data, detected, easter, year, hd_elems, 
fday, count)
   use_other_cc = !use_other_cc;
   holiday (*init_data, detected, _(hd_text[HD_MADARAKA_DAY].ht_text),
           ptr_cc_id, "+", DAY_MIN, 6, year, hd_elems, fday, count);
-  holiday (*init_data, detected, _(hd_text[HD_NOI_DAY].ht_text),
-          ptr_cc_id, "+", 10, 10, year, hd_elems, fday, count);
+  if (year < 2010)
+    holiday (*init_data, detected, _(hd_text[HD_MOI_DAY].ht_text),
+             ptr_cc_id, "+", 10, 10, year, hd_elems, fday, count);
   holiday (*init_data, detected, _(hd_text[HD_ARMED_FORCES_DAY].ht_text),
           ptr_cc_id, "+", 20, 10, year, hd_elems, fday, count);
   holiday (*init_data, detected, _(hd_text[HD_CHRISTMAS_DAY].ht_text),
diff --git a/src/hd-defs.h b/src/hd-defs.h
index de525ec..f3e737d 100644
--- a/src/hd-defs.h
+++ b/src/hd-defs.h
@@ -553,7 +553,7 @@
 #  define HD_NEVADA_DAY                         447
 #  define HD_NEW_REGIME_ANNIVERSARY             448
 #  define HD_NOBEL_DAY                          449
-#  define HD_NOI_DAY                            450
+#  define HD_MOI_DAY                            450
 #  define HD_OAU_DAY                            451
 #  define HD_OCTOBER_HOLIDAY                    452
 #  define HD_OIL_INDUSTRY_DAY                   453
-- 
2.13.3