* src/plugins/Verify.py: handle different calendars properly
* src/FamilyView.py: fix references to add_to_person_list svn: r2215
This commit is contained in:
parent
1451ac5552
commit
619634ca4b
@ -453,7 +453,7 @@ class FamilyView:
|
|||||||
else:
|
else:
|
||||||
self.parent.db.addPersonNoMap(epo.person,epo.person.getId())
|
self.parent.db.addPersonNoMap(epo.person,epo.person.getId())
|
||||||
self.parent.db.buildPersonDisplay(epo.person.getId())
|
self.parent.db.buildPersonDisplay(epo.person.getId())
|
||||||
self.parent.add_to_person_list(epo.person,0)
|
self.parent.people_view.add_to_person_list(epo.person,0)
|
||||||
|
|
||||||
self.family = self.parent.db.newFamily()
|
self.family = self.parent.db.newFamily()
|
||||||
self.person.addFamily(self.family)
|
self.person.addFamily(self.family)
|
||||||
@ -517,7 +517,7 @@ class FamilyView:
|
|||||||
self.parent.db.addPersonNoMap(epo.person,epo.person.getId())
|
self.parent.db.addPersonNoMap(epo.person,epo.person.getId())
|
||||||
|
|
||||||
self.parent.db.buildPersonDisplay(epo.person.getId())
|
self.parent.db.buildPersonDisplay(epo.person.getId())
|
||||||
self.parent.add_to_person_list(epo.person,0)
|
self.parent.people_view.add_to_person_list(epo.person,0)
|
||||||
|
|
||||||
if not self.family:
|
if not self.family:
|
||||||
self.family = self.parent.db.newFamily()
|
self.family = self.parent.db.newFamily()
|
||||||
|
@ -49,6 +49,9 @@ import gtk.glade
|
|||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
import RelLib
|
import RelLib
|
||||||
import Utils
|
import Utils
|
||||||
|
import Date
|
||||||
|
import Gregorian
|
||||||
|
|
||||||
from gettext import gettext as _
|
from gettext import gettext as _
|
||||||
|
|
||||||
db = None
|
db = None
|
||||||
@ -61,6 +64,9 @@ def get_year( event ):
|
|||||||
if event != None:
|
if event != None:
|
||||||
dateObj = event.getDateObj()
|
dateObj = event.getDateObj()
|
||||||
if dateObj != None:
|
if dateObj != None:
|
||||||
|
dateObj = Date.Date(dateObj)
|
||||||
|
if dateObj.__class__ != Gregorian.Gregorian:
|
||||||
|
dateObj.set_calendar(Gregorian.Gregorian)
|
||||||
year = dateObj.getYear()
|
year = dateObj.getYear()
|
||||||
return year
|
return year
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user