mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-04 10:59:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #30918 -- Made timesince()/timeuntil() respect custom time strings for future and the same datetimes.

Browse source
This commit is contained in:
Hasan Ramezani 2019-10-28 11:17:29 +01:00 • committed by Mariusz Felisiak
parent 711a7d4d50
commit 52cb419072
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tests/utils_tests/test_timesince.py
View file

@ -2,8 +2,9 @@ import datetime
import unittest
from django.test.utils import requires_tz_support
from django.utils import timezone
from django.utils import timezone, translation
from django.utils.timesince import timesince, timeuntil
from django.utils.translation import npgettext_lazy
class TimesinceTests(unittest.TestCase):
@ -74,6 +75,18 @@ class TimesinceTests(unittest.TestCase):
)
self.assertEqual(timesince(self.t, self.t - 4 * self.oneday - 5 * self.oneminute), '0\xa0minutes')
def test_second_before_equal_first_humanize_time_strings(self):
time_strings = {
'minute': npgettext_lazy('naturaltime-future', '%d minute', '%d minutes'),
}
with translation.override('cs'):
for now in [self.t, self.t - self.onemicrosecond, self.t - self.oneday]:
with self.subTest(now):
self.assertEqual(
timesince(self.t, now, time_strings=time_strings),
'0\xa0minut',
)
@requires_tz_support
def test_different_timezones(self):
""" When using two different timezones. """