Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

7090: wrong age for dead people reported by webcal

Browse Source 
svn: r23349
This commit is contained in:
Doug Blank 2013-10-20 14:33:36 +00:00
parent ce15c0944f
commit 3fd56abd3e
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gen/lib/date.py
View File

@ -285,11 +285,21 @@ class Span(object):
return cmp(int(self), int(other)) return cmp(int(self), int(other))
def __repr__(self): def __repr__(self):
"""
Get the Span as an age. Use Span.as_time() to get as a textual
description of time greater than Span.ALIVE.
"""
return self.get_repr(as_age=True)
def get_repr(self, as_age=False):
"""
Get the representation as a time or age.
"""
if self.repr is not None: if self.repr is not None:
return self.repr return self.repr
elif self.valid: elif self.valid:
# TO_REWRITE: bug #5293 ! # TO_REWRITE: bug #5293 !
if self._diff(self.date1, self.date2)[0] > Span.ALIVE: if as_age and self._diff(self.date1, self.date2)[0] > Span.ALIVE:
return _("less than %s years") % Span.ALIVE return _("less than %s years") % Span.ALIVE
if self.date1.get_modifier() == Date.MOD_NONE: if self.date1.get_modifier() == Date.MOD_NONE:
if self.date2.get_modifier() == Date.MOD_NONE: if self.date2.get_modifier() == Date.MOD_NONE:
@ -468,7 +478,7 @@ class Span(object):
return True return True
return int(self) > int(other) return int(self) > int(other)
def format(self, precision=2): def format(self, precision=2, as_age=True):
""" """
Force a string representation at a level of precision. Force a string representation at a level of precision.
1 = only most significant level (year, month, day) 1 = only most significant level (year, month, day)
@ -477,7 +487,7 @@ class Span(object):
""" """
self.repr = None self.repr = None
self.precision = precision self.precision = precision
return repr(self) return self.get_repr(as_age)
def _format(self, diff_tuple): def _format(self, diff_tuple):
if diff_tuple == (-1, -1, -1): return _("unknown") if diff_tuple == (-1, -1, -1): return _("unknown")