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

* src/plugins/DetAncestralReport.py: add import of string

Browse Source 
* src/plugins/DetDescendantReport.py: add import of string
* src/Date.py: compare date modes when comparing dates
* src/EditPerson.py: save date strings which comparing for changes
* src/FamilyView.py: Scope Person.male properly


svn: r1839
This commit is contained in:
Don Allingham 2003-07-08 00:42:26 +00:00
parent a129809402
commit 5384b63ffa
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gramps2/src/Date.py
View File

@ -445,7 +445,9 @@ def compare_dates(f,s):
first = f.get_start_date()
second = s.get_start_date()
if first.year != second.year:
if first.mode != second.mode:
return 1
elif first.year != second.year:
return cmp(first.year,second.year)
elif first.month != second.month:
return cmp(first.month,second.month)
@ -454,7 +456,9 @@ def compare_dates(f,s):
else:
first = f.get_stop_date()
second = s.get_stop_date()
if first.year != second.year:
if first.mode != second.mode:
return 1
elif first.year != second.year:
return cmp(first.year,second.year)
elif first.month != second.month:
return cmp(first.month,second.month)

4
gramps2/src/EditPerson.py
View File

@ -922,6 +922,10 @@ class EditPerson:
surname = self.surname_field.get_text()
if GrampsCfg.capitalize:
surname = surname.upper()
self.birth.setDate(self.bdate.get_text())
self.death.setDate(self.ddate.get_text())
ntype = self.ntype_field.entry.get_text()
suffix = self.suffix.get_text()
prefix = self.prefix.get_text()

4
gramps2/src/FamilyView.py
View File

@ -754,14 +754,14 @@ class FamilyView:
def icelandic(self,val):
fname = ""
if self.person.getGender() == Person.male:
if self.person.getGender() == RelLib.Person.male:
fname = self.person.getPrimaryName().getFirstName()
elif self.family:
f = self.family.getFather()
if f:
fname = f.getPrimaryName().getFirstName()
if fname:
fname = string.split(fname)[0]
fname = fname.split()[0]
if val == 0:
return "%ssson" % fname
elif val == 1:

1
gramps2/src/plugins/DetAncestralReport.py
View File

@ -24,6 +24,7 @@ import RelLib
import os
import sort
import Errors
import string
from intl import gettext as _
from QuestionDialog import ErrorDialog

2
gramps2/src/plugins/DetDescendantReport.py
View File

@ -24,6 +24,8 @@ import RelLib
import os
import sort
import Errors
import string
from QuestionDialog import ErrorDialog
from intl import gettext as _