From 0bba30bd060446613c2f26ae80817920f097fc52 Mon Sep 17 00:00:00 2001 From: kmbn Date: Fri, 28 Apr 2017 18:16:27 +0200 Subject: [PATCH 1/3] Simplify date localization --- .../scheming/package/snippets/additional_info.html | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/ckanext/scheming/templates/scheming/package/snippets/additional_info.html b/ckanext/scheming/templates/scheming/package/snippets/additional_info.html index d9cd1e1a..7bbeda3e 100644 --- a/ckanext/scheming/templates/scheming/package/snippets/additional_info.html +++ b/ckanext/scheming/templates/scheming/package/snippets/additional_info.html @@ -20,8 +20,7 @@ {{ h.scheming_language_text(dates[n].role|capitalize) }} - {% set date = h.scheming_localize_date(dates[n].date) %} - {{ date }} + {{ h.scheming_localize_date(dates[n].date) }} {% endfor %} {% elif field.field_name == 'temporal_coverage' %} @@ -29,13 +28,11 @@ {% if tcdates.temporal_coverage_from %} {{ _('Zeitrahmen von') }} - {% set date = h.scheming_localize_date(tcdates.temporal_coverage_from) %} - {{ date }} + {{ h.scheming_localize_date(tcdates.temporal_coverage_from) }} {{ _('Zeitrahmen bis') }} - {% set date = h.scheming_localize_date(tcdates.temporal_coverage_to) %} - {{ date }} + {{ h.scheming_localize_date(tcdates.temporal_coverage_to) }} {% endif %} {% else %} From 78c86c59b0b84976ad890c9080300a2a1f3fe295 Mon Sep 17 00:00:00 2001 From: kmbn Date: Fri, 28 Apr 2017 18:17:34 +0200 Subject: [PATCH 2/3] Handle datetimes as well as dates --- ckanext/scheming/helpers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ckanext/scheming/helpers.py b/ckanext/scheming/helpers.py index 4db872f9..e794f708 100644 --- a/ckanext/scheming/helpers.py +++ b/ckanext/scheming/helpers.py @@ -340,9 +340,9 @@ def scheming_localize_date(date): else: div = '/' if date[2] not in ['/', '.', '-']: - localized_date = date[8:]+div+date[5:7]+div+date[:4] + localized_date = date[8:10]+div+date[5:7]+div+date[:4] else: - localized_date = date[:2]+div+date[3:5]+div+date[6:] + localized_date = date[:2]+div+date[3:5]+div+date[6:10] return localized_date else: return '' \ No newline at end of file From f8bcdb72ccf67dff169699e64775e4c198d2039a Mon Sep 17 00:00:00 2001 From: kmbn Date: Fri, 28 Apr 2017 18:18:12 +0200 Subject: [PATCH 3/3] Render resource dates in same format as dataset dates --- .../scheming/templates/scheming/package/resource_read.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ckanext/scheming/templates/scheming/package/resource_read.html b/ckanext/scheming/templates/scheming/package/resource_read.html index baa356ab..f23206da 100644 --- a/ckanext/scheming/templates/scheming/package/resource_read.html +++ b/ckanext/scheming/templates/scheming/package/resource_read.html @@ -22,13 +22,13 @@

{{ _('Additional Information') }}

{%- block resource_last_updated -%} {{ _('Last updated') }} - {{ h.render_datetime(res.last_modified) or h.render_datetime(res.revision_timestamp) or h.render_datetime(res.created) or _('unknown') }} + {{ h.scheming_localize_date(res.last_modified) or h.scheming_localize_date(res.revision_timestamp) or h.scheming_localize_date(res.created) or _('unknown') }} {%- endblock -%} {%- block resource_created -%} {{ _('Created') }} - {{ h.render_datetime(res.created) or _('unknown') }} + {{ h.scheming_localize_date(res.created) or _('unknown') }} {%- endblock -%} {%- block resource_format -%}