Ticket #4768: dateformat_timesince_cleanup.diff

django/utils/timesince.py

@@ -33 +33 @@
-    delta = now - (d - datetime.timedelta(0, 0, d.microsecond))
-    since = delta.days * 24 * 60 * 60 + delta.seconds
-    for i, (seconds, name) in enumerate(chunks):
-
+/
-        if count != 0:
-            break
-    if count < 0:
-        return ugettext('%d milliseconds') % math.floor((now - d).microseconds / 1000)
-    s = ugettext('%(number)d %(type)s') % {'number': count, 'type': name(count)}
-    if i + 1 < len(chunks):
-        # Now get the second item
-        seconds2, name2 = chunks[i + 1]
-
+/
-        if count2 != 0:
-            s += ugettext(', %(number)d %(type)s') % {'number': count2, 'type': name2(count2)}
-    return s

django/utils/dateformat.py

@@ -227 +227 @@
-                week_number = 1
-            else:
-                j = day_of_year + (7 - weekday) + (jan1_weekday - 1)
-
+/
-                if jan1_weekday > 4:
-                    week_number -= 1
-        return week_number