|
|
@ -66,11 +66,12 @@ def timesince(timestamp): |
|
|
|
# all divs in Python 2.x are integers; we'll have to check this again |
|
|
|
# all divs in Python 2.x are integers; we'll have to check this again |
|
|
|
# when we change to Python 3. |
|
|
|
# when we change to Python 3. |
|
|
|
|
|
|
|
|
|
|
|
result.append('%s %s' % (part, name)) |
|
|
|
result.append('%s %s' % (part, name(part))) |
|
|
|
since -= (seconds * part) |
|
|
|
since -= (seconds * part) |
|
|
|
|
|
|
|
|
|
|
|
# since now only have seconds (which are out of our "chunks") |
|
|
|
# since now only have seconds (which are out of our "chunks") |
|
|
|
result.append(N_('%s second', '%s seconds', since)) |
|
|
|
seconds = N_('second', 'seconds', since) |
|
|
|
|
|
|
|
result.append('%d %s' % (since, seconds)) |
|
|
|
|
|
|
|
|
|
|
|
whole_message = ', '.join(result) |
|
|
|
whole_message = ', '.join(result) |
|
|
|
return _('%s ago') % (whole_message) |
|
|
|
return _('%s ago') % (whole_message) |
|
|
|