diff --git a/src/Simple/_SimpleAccess.py b/src/Simple/_SimpleAccess.py index 9060f8cc0..2afcd00dd 100644 --- a/src/Simple/_SimpleAccess.py +++ b/src/Simple/_SimpleAccess.py @@ -571,6 +571,18 @@ class SimpleAccess: else: return u'' + def event_date_obj(self, event): + """ + Return a string indicating the date of the event + + @param event: Event object + @type event: L{gen.lib.Event} + @return: Returns a string indicating the date of the event + @rtype: unicode + """ + assert(isinstance(event, (gen.lib.Event, NoneType))) + return event.get_date_object() + def event_type(self, event): """ Return a string indicating the type of the event diff --git a/src/plugins/all_events.py b/src/plugins/all_events.py index e803483c3..0589060d7 100644 --- a/src/plugins/all_events.py +++ b/src/plugins/all_events.py @@ -59,7 +59,7 @@ def run(database, document, person): for event in event_list: stab.row(event, - sdb.event_date(event), + sdb.event_date_obj(event), sdb.event_place(event)) stab.write() @@ -104,7 +104,7 @@ def run_fam(database, document, family): for (person, event) in event_list: stab.row(person, sdb.event_type(event), - sdb.event_date(event), + sdb.event_date_obj(event), sdb.event_place(event)) stab.write() @@ -114,7 +114,7 @@ def run_fam(database, document, family): _("Event Date"), _("Event Place")) for (person, event) in event_list_children: stab.row(person, sdb.event_type(event), - sdb.event_date(event), + sdb.event_date_obj(event), sdb.event_place(event)) stab.write() diff --git a/src/plugins/lineage.py b/src/plugins/lineage.py index f6cfd9240..6d1aabb54 100644 --- a/src/plugins/lineage.py +++ b/src/plugins/lineage.py @@ -113,8 +113,8 @@ def make_details(gender, person, sa, sd, database, stab) : rem_str = "" while person: person_handle = person.handle - stab.row(person, sa.birth_date(person), - sa.death_date(person), rem_str) + stab.row(person, sa.birth_date_obj(person), + sa.death_date_obj(person), rem_str) #if rem_str: # sd.paragraph(__FMT_REM % (_("Remark"), rem_str))