Skip to content

Commit

Permalink
Fixed missing timezone information in CSV export #924
Browse files Browse the repository at this point in the history
  • Loading branch information
dennissiemensma committed Mar 14, 2020
1 parent 84125c3 commit 12dfb0a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion dsmr_frontend/views/export.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,4 +126,4 @@ def _serialize_field(self, data):
return formats.date_format(data, 'DSMR_EXPORT_DATETIME_FORMAT')

elif isinstance(data, datetime.date): # pragma: no cover
return formats.date_format(data, 'DSMR_DATEPICKER_DATE_FORMAT')
return formats.date_format(data, 'DSMR_EXPORT_DATE_FORMAT')
3 changes: 2 additions & 1 deletion dsmrreader/formats/en/formats.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
DSMR_DATEPICKER_DATE_FORMAT = 'Y-m-d'
DSMR_DATEPICKER_MONTH = 'F Y'

DSMR_EXPORT_DATETIME_FORMAT = 'Y-m-d H:i:s'
DSMR_EXPORT_DATETIME_FORMAT = 'c'
DSMR_EXPORT_DATE_FORMAT = 'Y-m-d'
DSMR_STATISTICS_DATETIME_FORMAT = 'l F jS Y \\a\\t g:i a'

DJANGO_DATE_FORMAT = 'Y-m-d'
3 changes: 2 additions & 1 deletion dsmrreader/formats/nl/formats.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
DSMR_DATEPICKER_DATE_FORMAT = 'd-m-Y'
DSMR_DATEPICKER_MONTH = 'F Y'

DSMR_EXPORT_DATETIME_FORMAT = 'd-m-Y H:i:s'
DSMR_EXPORT_DATETIME_FORMAT = 'c'
DSMR_EXPORT_DATE_FORMAT = 'd-m-Y'
DSMR_STATISTICS_DATETIME_FORMAT = 'l j F Y \o\m G:i'

DJANGO_DATE_FORMAT = 'd-m-Y'
Binary file modified dsmrreader/locales/nl/LC_MESSAGES/django.mo
Binary file not shown.

0 comments on commit 12dfb0a

Please sign in to comment.