diff --git a/src/Utils.py b/src/Utils.py index 1078fcdcb..842035dcf 100644 --- a/src/Utils.py +++ b/src/Utils.py @@ -667,13 +667,25 @@ class ProbablyAlive(object): if mother_handle == person.handle and father_handle: father = self.db.get_person_from_handle(father_handle) date1, date2, explain, other = self.probably_alive_range(father, is_spouse=True) - if date1 and date2: - return date1, date2, _("a spouse, ") + explain, other + if date1 and date1.get_year() != 0: + return (gen.lib.Date().copy_ymd(date1.get_year() - self.AVG_GENERATION_GAP), + gen.lib.Date().copy_ymd(date1.get_year() - self.AVG_GENERATION_GAP + self.MAX_AGE_PROB_ALIVE), + _("a spouse, ") + explain, other) + elif date2 and date2.get_year() != 0: + return (gen.lib.Date().copy_ymd(date2.get_year() + self.AVG_GENERATION_GAP - self.MAX_AGE_PROB_ALIVE), + gen.lib.Date().copy_ymd(date2.get_year() + self.AVG_GENERATION_GAP), + _("a spouse, ") + explain, other) elif father_handle == person.handle and mother_handle: mother = self.db.get_person_from_handle(mother_handle) date1, date2, explain, other = self.probably_alive_range(mother, is_spouse=True) - if date1 and date2: - return date1, date2, _("a spouse, ") + explain, other + if date1 and date1.get_year() != 0: + return (gen.lib.Date().copy_ymd(date1.get_year() - self.AVG_GENERATION_GAP), + gen.lib.Date().copy_ymd(date1.get_year() - self.AVG_GENERATION_GAP + self.MAX_AGE_PROB_ALIVE), + _("a spouse, ") + explain, other) + elif date2 and date2.get_year() != 0: + return (gen.lib.Date().copy_ymd(date2.get_year() + self.AVG_GENERATION_GAP - self.MAX_AGE_PROB_ALIVE), + gen.lib.Date().copy_ymd(date2.get_year() + self.AVG_GENERATION_GAP), + _("a spouse, ") + explain, other) # Let's check the family events and see if we find something for ref in family.get_event_ref_list(): if ref: