From 096a2c6269c6baa50a44400d84aa8a1b1000c4ab Mon Sep 17 00:00:00 2001
From: Bart Feenstra <bart@mynameisbart.com>
Date: Sat, 30 Mar 2019 09:58:30 +0000
Subject: [PATCH] Implement the HTML <time> element.

---
 betty/render.py                               | 20 ++------------
 .../templates/event-dimensions.html.j2        |  3 ++-
 betty/resources/templates/macro/date.html.j2  | 26 +++++++++++++++++++
 3 files changed, 30 insertions(+), 19 deletions(-)
 create mode 100644 betty/resources/templates/macro/date.html.j2

diff --git a/betty/render.py b/betty/render.py
index 7b4a41827..29a55ab66 100644
--- a/betty/render.py
+++ b/betty/render.py
@@ -11,7 +11,7 @@
 from markupsafe import Markup
 
 import betty
-from betty.ancestry import Entity, Date
+from betty.ancestry import Entity
 from betty.json import JSONEncoder
 from betty.npm import install, BETTY_INSTANCE_NPM_DIR
 from betty.path import iterfiles
@@ -24,11 +24,11 @@ def render(site: Site) -> None:
         autoescape=select_autoescape(['html'])
     )
     environment.globals['site'] = site
+    environment.globals['calendar'] = calendar
     environment.filters['flatten'] = _render_flatten
     environment.filters['walk'] = _render_walk
     environment.filters['json'] = _render_json
     environment.filters['paragraphs'] = _render_html_paragraphs
-    environment.filters['date'] = _render_date
 
     _render_public(site, environment)
     _render_webpack(site, environment)
@@ -167,19 +167,3 @@ def _render_html_paragraphs(eval_ctx, text: str) -> Union[str, Markup]:
     if eval_ctx.autoescape:
         result = Markup(result)
     return result
-
-
-def _render_date(date: Date) -> str:
-    # All components.
-    if date.year and date.month and date.day:
-        return '%s %d, %d' % (calendar.month_name[date.month], date.day, date.year)
-    # No year.
-    if not date.year and date.month and date.day:
-        return '%s %d' % (calendar.month_name[date.month], date.day)
-    # No month.
-    if date.year and not date.month:
-        return str(date.year)
-    # No day.
-    if date.year and date.month and not date.day:
-        return '%s, %d' % (calendar.month_name[date.month], date.year)
-    return 'unknown date'
diff --git a/betty/resources/templates/event-dimensions.html.j2 b/betty/resources/templates/event-dimensions.html.j2
index 14d2a3398..97bcc3302 100644
--- a/betty/resources/templates/event-dimensions.html.j2
+++ b/betty/resources/templates/event-dimensions.html.j2
@@ -1,5 +1,6 @@
 {% if event.date %}
-    {{ event.date | date }}
+    {% import 'macro/date.html.j2' as dateMacros %}
+    {{ dateMacros.format(event.date) }}
 {% endif %}
 {% if event.place and event.place != place_context %}
     in
diff --git a/betty/resources/templates/macro/date.html.j2 b/betty/resources/templates/macro/date.html.j2
new file mode 100644
index 000000000..f910fba7a
--- /dev/null
+++ b/betty/resources/templates/macro/date.html.j2
@@ -0,0 +1,26 @@
+{%- macro format(date) -%}
+    {# All components. #}
+    {%- if date.year and date.month and date.day -%}
+        {%- set formatted = calendar.month_name[date.month] + ' ' + date.day | string + ', ' + date.year | string -%}
+        {%- set timevals = [date.year, '{:0>2}'.format(date.month), '{:0>2}'.format(date.day)] -%}
+    {# No year, but month and day. #}
+    {%- elif not date.year and date.month and date.day -%}
+        {%- set formatted = calendar.month_name[date.month] + ' ' + date.day | string -%}
+        {%- set timevals = ['{:0>2}'.format(date.month), '{:0>2}'.format(date.day)] -%}
+    {# No month, but year. #}
+    {%- elif date.year and not date.month -%}
+        {%- set formatted = date.year | string -%}
+        {%- set timevals = [date.year] -%}
+    {# No day, but year and month. #}
+    {%- elif date.year and date.month and not date.day -%}
+        {%- set formatted = calendar.month_name[date.month] + ', ' + date.year | string -%}
+        {%- set timevals = [date.year, '{:0>2}'.format(date.month)] -%}
+    {%- else -%}
+        {%- set formatted = 'unknown date' -%}
+    {%- endif -%}
+    {%- if timevals is defined -%}
+        <time datetime="{{ timevals | join('-') }}">{{ formatted }}</time>
+    {%- else -%}
+        {{ formatted }}
+    {%- endif -%}
+{%- endmacro -%}
\ No newline at end of file