kallithea Changeset - 2982360d2547

Changeset - 2982360d2547

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Aras Pranckevicius - 11 years ago 2015-01-04 13:03:23
aras@unity3d.com

utils: better display of ages >1 year when in short form

* 1..2 years: display as months instead
* 2+ years: round

2 files changed with 16 insertions and 3 deletions:

kallithea/lib/utils2.py

kallithea/tests/other/test_libs.py

0 comments (0 inline, 0 general)

kallithea/lib/utils2.py

➞

Show inline comments

@@ @@ -408,6 +408,18 @@ def age(prevdate, show_short_version=Fal @@
         deltas['month'] += 12
         deltas['year'] -= 1
     # In short version, we want nicer handling of ages of more than a year
     if show_short_version:
         if deltas['year'] == 1:
             # ages between 1 and 2 years: show as months
             deltas['month'] += 12
             deltas['year'] = 0
         if deltas['year'] >= 2:
             # ages 2+ years: round
             if deltas['month'] > 6:
                 deltas['year'] += 1
                 deltas['month'] = 0
     # Format the result
     fmt_funcs = {
         'year': lambda d: ungettext(u'%d year', '%d years', d) % d,

kallithea/tests/other/test_libs.py

➞

Show inline comments

@@ @@ -150,11 +150,12 @@ class TestLibs(BaseTestCase): @@
         (dict(months= -1), u'1 month ago'),
         (dict(months= -1, days= -2), u'1 month ago'),
         (dict(months= -1, days= -20), u'1 month ago'),
         (dict(years= -1, months= -1), u'1 year ago'),
         (dict(years= -1, months= -10), u'1 year ago'),
         (dict(years= -1, months= -1), u'13 months ago'),
         (dict(years= -1, months= -10), u'22 months ago'),
         (dict(years= -2, months= -4), u'2 years ago'),
-        (dict(years= -2, months= -11), u'2 years ago'),
+        (dict(years= -2, months= -11), u'3 years ago'),
         (dict(years= -3, months= -2), u'3 years ago'),
         (dict(years= -4, months= -8), u'5 years ago'),
     ])
     def test_age_short(self, age_args, expected):
         from kallithea.lib.utils2 import age

0 comments (0 inline, 0 general)