holiday sensor: minor adjustments

brianhanifin · Dec 22, 2019 · 8a83845 · 8a83845
1 parent 1e2d356
commit 8a83845
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 32 deletions.
diff --git a/integration_components/sensors/datetime/holiday.yaml b/integration_components/sensors/datetime/holiday.yaml
@@ -7,12 +7,13 @@ scan_interval: 86400
 value_template: >
   {% set today = now().month  ~ '/' ~ now().day  -%}
   {%- set personal = value_json.PERSONAL[ today ]|trim -%}
-  {%- set holiday = value_json.MAJOR_US.static[ today ]|trim -%}
+  {%- set holiday = value_json.MAJOR_US[ today ]|trim -%}
 
   {%- macro pcase(text) -%}
     {{ text[0]|upper}}{{text[1:] }}
   {%- endmacro -%}
-  {%- macro get_dyanmic_holiday(event) -%}
+  
+  {%- macro get_dynamic_holiday(event) -%}
     {%- set today = states('sensor.date') -%}
     {%- if today == event -%}
       {%- set date_parts = states(event).split('-') -%}
@@ -26,15 +27,16 @@ value_template: >
       {%- endif -%}
     {%- endif -%}
   {%- endmacro -%}
+
   {%- if holiday == '' -%}
-    {%- set holiday = get_dyanmic_holiday('sensor.date_easter') -%}
-    {%- set holiday = get_dyanmic_holiday('sensor.date_fathers') -%}
-    {%- set holiday = get_dyanmic_holiday('sensor.date_labor') -%}
-    {%- set holiday = get_dyanmic_holiday('sensor.date_memorial') -%}
-    {%- set holiday = get_dyanmic_holiday('sensor.date_mlk') -%}
-    {%- set holiday = get_dyanmic_holiday('sensor.date_mothers') -%}
-    {%- set holiday = get_dyanmic_holiday('sensor.date_presidents') -%}
-    {%- set holiday = get_dyanmic_holiday('sensor.date_thanksgiving') -%}
+    {%- set holiday = get_dynamic_holiday('sensor.date_easter') -%}
+    {%- set holiday = get_dynamic_holiday('sensor.date_fathers') -%}
+    {%- set holiday = get_dynamic_holiday('sensor.date_labor') -%}
+    {%- set holiday = get_dynamic_holiday('sensor.date_memorial') -%}
+    {%- set holiday = get_dynamic_holiday('sensor.date_mlk') -%}
+    {%- set holiday = get_dynamic_holiday('sensor.date_mothers') -%}
+    {%- set holiday = get_dynamic_holiday('sensor.date_presidents') -%}
+    {%- set holiday = get_dynamic_holiday('sensor.date_thanksgiving') -%}
   {%- endif -%}
 
   {%- if personal != '' -%}

diff --git a/json_data/dates.json b/json_data/dates.json
@@ -20,27 +20,25 @@
     "12/23": "2 days until Christmas"
   },
   "MAJOR_US": {
-    "static": {
-      "1/1":   "New Year's Day",
-      "2/2":   "Groundhog Day",
-      "2/14":  "Valentine's Day",
-      "3/14":  "Pi Day",
-      "3/17":  "St. Patrick's Day",
-      "4/1":   "April Fool's Day",
-      "4/22":  "Earth Day",
-      "5/4":   "Star Wars Day",
-      "5/5":   "Cinco de Mayo",
-      "7/4":   "Independence Day",
-      "9/11":  "Patriot Day",
-      "10/8":  "Indigenous Peoples' Day",
-      "10/31": "Halloween",
-      "11/6":  "Election Day",
-      "11/11": "Veterans' Day",
-      "11/25": "National First Responder Appreciation Day",
-      "12/7":  "Pearl Harbor Day",
-      "12/24": "Christmas Eve",
-      "12/25": "Christmas Day",
-      "12/31": "New Year's Eve"
-    }
+    "1/1":   "New Year's Day",
+    "2/2":   "Groundhog Day",
+    "2/14":  "Valentine's Day",
+    "3/14":  "Pi Day",
+    "3/17":  "St. Patrick's Day",
+    "4/1":   "April Fool's Day",
+    "4/22":  "Earth Day",
+    "5/4":   "Star Wars Day",
+    "5/5":   "Cinco de Mayo",
+    "7/4":   "Independence Day",
+    "9/11":  "Patriot Day",
+    "10/8":  "Indigenous Peoples' Day",
+    "10/31": "Halloween",
+    "11/6":  "Election Day",
+    "11/11": "Veterans' Day",
+    "11/25": "National First Responder Appreciation Day",
+    "12/7":  "Pearl Harbor Day",
+    "12/24": "Christmas Eve",
+    "12/25": "Christmas Day",
+    "12/31": "New Year's Eve"
   }
 }