From 9aabed5c4f9570ba47ad423a91a9408a6ce1f844 Mon Sep 17 00:00:00 2001 From: Serge Noiraud Date: Thu, 24 Dec 2009 17:21:55 +0000 Subject: [PATCH] GeoView : issue 3472 svn: r13909 --- src/plugins/view/geoview.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/plugins/view/geoview.py b/src/plugins/view/geoview.py index 3500f7287..890738e75 100644 --- a/src/plugins/view/geoview.py +++ b/src/plugins/view/geoview.py @@ -88,6 +88,7 @@ _ICONS = { #------------------------------------------------------------------------- import re ZOOMANDPOS = re.compile('zoom=([0-9]*) coord=([0-9\.\-\+]*), ([0-9\.\-\+]*):::') +cal = config.get('preferences.calendar-format-report') #------------------------------------------------------------------------- # @@ -1599,7 +1600,7 @@ class GeoView(HtmlView): event_ref = person.get_birth_ref() if event_ref: event = dbstate.db.get_event_from_handle(event_ref.ref) - eventyear = event.get_date_object().get_year() + eventyear = event.get_date_object().to_calendar(cal).get_year() place_handle = event.get_place_handle() if place_handle: place = dbstate.db.get_place_from_handle(place_handle) @@ -1636,7 +1637,7 @@ class GeoView(HtmlView): event_ref = person.get_death_ref() if event_ref: event = dbstate.db.get_event_from_handle(event_ref.ref) - eventyear = event.get_date_object().get_year() + eventyear = event.get_date_object().to_calendar(cal).get_year() place_handle = event.get_place_handle() if place_handle: place = dbstate.db.get_place_from_handle(place_handle) @@ -1724,7 +1725,7 @@ class GeoView(HtmlView): for event in dbstate.db.iter_events(): place_handle = event.get_place_handle() - eventyear = event.get_date_object().get_year() + eventyear = event.get_date_object().to_calendar(cal).get_year() if place_handle: place = dbstate.db.get_place_from_handle(place_handle) if place: @@ -1863,7 +1864,7 @@ class GeoView(HtmlView): # Only match primaries, no witnesses continue event = dbstate.db.get_event_from_handle(event_ref.ref) - eventyear = event.get_date_object().get_year() + eventyear = event.get_date_object().to_calendar(cal).get_year() place_handle = event.get_place_handle() if place_handle: place = dbstate.db.get_place_from_handle(place_handle)