From 9e0d911f7b01d21d73603fff970fa91e2c5a585c Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@aalto.fi>
Date: Wed, 9 May 2018 22:16:40 +0300
Subject: [PATCH] Fix date rendering

---
 members/tables.py            |  5 +++--
 members/templates/error.html | 18 ------------------
 templates/error.html         |  2 +-
 3 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 members/templates/error.html

diff --git a/members/tables.py b/members/tables.py
index 4c6fd2d..a8f65e0 100644
--- a/members/tables.py
+++ b/members/tables.py
@@ -4,6 +4,7 @@ import django_tables2 as tables
 from django.utils.translation import ugettext as _
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import F, OuterRef, Subquery
+from django.utils import timezone
 
 from members.models import Member, Payment, Request
 
@@ -25,9 +26,9 @@ class MemberTable(tables.Table):
 
     def render_last_paid(self, record):
         try:
-            return record.payments.filter(member=record).latest('date').date.strftime('%e.%m.%Y %H:%M')
+            return timezone.localtime(record.payments.filter(member=record).latest('date').date).strftime('%-d.%-m.%Y %H:%M')
         except ObjectDoesNotExist:
-            return record.created.strftime('%e.%m.%Y %H:%M') + _(" (not paid)")
+            return timezone.localtime(record.created).strftime('%-d.%-m.%Y %H:%M') + _(" (not paid)")
 
     def order_last_paid(self, queryset, is_descending):
         latest = Payment.objects.filter(member=OuterRef('pk')).order_by('-date')
diff --git a/members/templates/error.html b/members/templates/error.html
deleted file mode 100644
index 3d09501..0000000
--- a/members/templates/error.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "members:base.html" %}
-
-{% load static %}
-{% load i18n %}
-{% block content %}
-<div>
-    <div>
-        <h3>{% trans "Error" %}</h3>
-    </div>
-
-    <div class="alert alert-danger">
-        {{ error|safe }}
-    </div>
-    <div>
-        <button onclick="window.history.back();" class="btn btn-primary">{% trans "Back" %}</button>
-    </div>
-</div>
-{% endblock content %}
diff --git a/templates/error.html b/templates/error.html
index 745eb56..3d09501 100644
--- a/templates/error.html
+++ b/templates/error.html
@@ -1,4 +1,4 @@
-{% extends "members_base.html" %}
+{% extends "members:base.html" %}
 
 {% load static %}
 {% load i18n %}