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

8602: Age in the event family view column is wrong. better solution.

Browse Source
This commit is contained in:
SNoiraud 2016-03-20 13:38:39 +01:00
parent d414f33d01
commit 0c67821171
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gramps/gen/lib/date.py
View File

@ -280,9 +280,6 @@ class Span(object):
_repr = trans_text("greater than %s years") % Span.ALIVE _repr = trans_text("greater than %s years") % Span.ALIVE
elif self.date1.get_modifier() == Date.MOD_NONE: elif self.date1.get_modifier() == Date.MOD_NONE:
if self.date2.get_modifier() == Date.MOD_NONE: if self.date2.get_modifier() == Date.MOD_NONE:
if fdate12[0] == '-':
# a negative age is not realistic
fdate12 = '(' + fdate12[1:].replace('-', '') + ')'
_repr = fdate12 _repr = fdate12
elif self.date2.get_modifier() == Date.MOD_BEFORE: elif self.date2.get_modifier() == Date.MOD_BEFORE:
_repr = trans_text("more than") + " " + fdate12 _repr = trans_text("more than") + " " + fdate12
@ -361,7 +358,10 @@ class Span(object):
self._format(self._diff(start1, stop2), dlocale) + self._format(self._diff(start1, stop2), dlocale) +
" " + trans_text("and") + " " + " " + trans_text("and") + " " +
self._format(self._diff(stop1, start2), dlocale)) self._format(self._diff(stop1, start2), dlocale))
if _repr.find('-') == -1: # we don't have a negative value to return.
return _repr return _repr
else:
return '(' + _repr.replace('-', '') + ')'
def __eq__(self, other): def __eq__(self, other):
""" """