marcel/linkding
1
0
Fork 0
mirror of https://github.com/sissbruecker/linkding.git synced 2025-08-08 03:08:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix relative date formatting (#107)

Browse Source
This commit is contained in:
Sascha Ißbrücker
2021-04-06 23:38:15 +02:00
committed by GitHub
parent 847f9644f4
commit 90f62d3482
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bookmarks/tests/test_utils.py
View File

@@ -1,3 +1,5 @@
from unittest.mock import patch
from django.test import TestCase from django.test import TestCase
from django.utils import timezone from django.utils import timezone
@@ -23,6 +25,14 @@ class UtilsTestCase(TestCase):
result = humanize_absolute_date(test_case[0], test_case[1]) result = humanize_absolute_date(test_case[0], test_case[1])
self.assertEqual(test_case[2], result) self.assertEqual(test_case[2], result)
def test_humanize_absolute_date_should_use_current_date_as_default(self):
with patch.object(timezone, 'now', return_value=timezone.datetime(2021, 1, 1)):
self.assertEqual(humanize_absolute_date(timezone.datetime(2021, 1, 1)), 'Today')
# Regression: Test that subsequent calls use current date instead of cached date (#107)
with patch.object(timezone, 'now', return_value=timezone.datetime(2021, 1, 13)):
self.assertEqual(humanize_absolute_date(timezone.datetime(2021, 1, 13)), 'Today')
def test_humanize_relative_date(self): def test_humanize_relative_date(self):
test_cases = [ test_cases = [
(timezone.datetime(2021, 1, 1), timezone.datetime(2022, 1, 1), '1 year ago'), (timezone.datetime(2021, 1, 1), timezone.datetime(2022, 1, 1), '1 year ago'),
@@ -45,3 +55,11 @@ class UtilsTestCase(TestCase):
for test_case in test_cases: for test_case in test_cases:
result = humanize_relative_date(test_case[0], test_case[1]) result = humanize_relative_date(test_case[0], test_case[1])
self.assertEqual(test_case[2], result) self.assertEqual(test_case[2], result)
def test_humanize_relative_date_should_use_current_date_as_default(self):
with patch.object(timezone, 'now', return_value=timezone.datetime(2021, 1, 1)):
self.assertEqual(humanize_relative_date(timezone.datetime(2021, 1, 1)), 'Today')
# Regression: Test that subsequent calls use current date instead of cached date (#107)
with patch.object(timezone, 'now', return_value=timezone.datetime(2021, 1, 13)):
self.assertEqual(humanize_relative_date(timezone.datetime(2021, 1, 13)), 'Today')

9
bookmarks/utils.py
View File

@@ -1,4 +1,5 @@
from datetime import datetime from datetime import datetime
from typing import Optional
from dateutil.relativedelta import relativedelta from dateutil.relativedelta import relativedelta
from django.template.defaultfilters import pluralize from django.template.defaultfilters import pluralize
@@ -20,7 +21,9 @@ weekday_names = {
} }
def humanize_absolute_date(value: datetime, now=timezone.now()): def humanize_absolute_date(value: datetime, now: Optional[datetime] = None):
if not now:
now = timezone.now()
delta = relativedelta(now, value) delta = relativedelta(now, value)
yesterday = now - relativedelta(days=1) yesterday = now - relativedelta(days=1)
@@ -36,7 +39,9 @@ def humanize_absolute_date(value: datetime, now=timezone.now()):
return weekday_names[value.isoweekday()] return weekday_names[value.isoweekday()]
def humanize_relative_date(value: datetime, now: datetime = timezone.now()): def humanize_relative_date(value: datetime, now: Optional[datetime] = None):
if not now:
now = timezone.now()
delta = relativedelta(now, value) delta = relativedelta(now, value)
if delta.years > 0: if delta.years > 0: