Hopiu/django-admin2
1
0
Fork 0
mirror of https://github.com/jazzband/django-admin2.git synced 2026-03-16 22:20:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed datetime_renderer to be compatible with django 1.8. Django ticket #23466

Browse source
This commit is contained in:
montiniz 2015-03-30 12:50:08 -05:00
parent 8a51b321f3
commit 03dea3c00b
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
djadmin2/renderers.py
View file

@ -46,11 +46,12 @@ def datetime_renderer(value, field):
"""
if isinstance(value, datetime):
# django ticket #23466 Removing seconds from locale formats
return formats.localize(timezone.template_localtime(value))
elif isinstance(value, (date, time)):
return formats.localize(value)
return ":".join((formats.localize(value)).split(":")[:2])
else:
return value
return ":".join(value.split(":")[:2])
def title_renderer(value, field):

8
djadmin2/tests/test_renderers.py
View file

@ -17,7 +17,7 @@ class RendererTestModel(models.Model):
class BooleanRendererTest(TestCase):
def setUp(self):
self.renderer = renderers.boolean_renderer
@ -59,7 +59,7 @@ class DatetimeRendererTest(TestCase):
def test_time_german(self):
activate('de')
out = self.renderer(dt.time(13, 37, 1), None)
self.assertEqual('13:37:01', out)
self.assertEqual('13:37', out)
def test_time_chinese(self):
activate('zh')
@ -70,6 +70,10 @@ class DatetimeRendererTest(TestCase):
out = self.renderer(dt.datetime(2013, 7, 6, 13, 37, 1), None)
self.assertEqual('July 6, 2013, 1:37 p.m.', out)
def test_date_as_string(self):
out = self.renderer('13:37:01', None)
self.assertEqual('13:37', out)
# TODO test timezone localization