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

* various: Change Person.male, Person.female, and Person.unkwown

Browse Source 
to Person.MALE, Person.FEMALE and Person.UNKNOWN

* gramps.spec.in: bring up to date, support Fedora Core and Mandrake
* src/plugins/NavWebPage.py: Start of the Narrative Web Page plugin


svn: r4008
This commit is contained in:
Don Allingham 2005-02-01 03:46:29 +00:00
parent 724e5b89ca
commit f7df43643f
47 changed files with 1861 additions and 482 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gramps2/ChangeLog
View File

@ -1,3 +1,11 @@
2005-01-31 Don Allingham <dallingham@users.sourceforge.net>
* various: Change Person.male, Person.female, and Person.unkwown
to Person.MALE, Person.FEMALE and Person.UNKNOWN
2005-01-30 Don Allingham <dallingham@users.sourceforge.net>
* gramps.spec.in: bring up to date, support Fedora Core and Mandrake
* src/plugins/NavWebPage.py: Start of the Narrative Web Page plugin
2005-01-30 Alex Roitman <shura@alex.neuro.umn.edu>
* src/WriteGrdb.py: Add to CVS.
* src/gramps.glade: Add Save as item, switch former one to Export.

2
gramps2/Makefile.am
View File

@ -1,6 +1,6 @@
SUBDIRS = src doc example
EXTRA_DIST = autogen.sh gramps.spec.in gramps.spec gramps-mdk.spec.in COPYING-DOCS FAQ
EXTRA_DIST = autogen.sh gramps.spec.in COPYING-DOCS FAQ
bin_SCRIPTS = gramps
distuninstallcheck_listfiles = find . -type -f -print | grep -E -v '/(globs|magic|XMLnamespaces)'

1
gramps2/configure.in
View File

@ -257,6 +257,5 @@ doc/gramps-manual/ru/Makefile
example/Makefile
example/gramps/Makefile
gramps.spec
gramps-mdk.spec
gramps.sh])
AC_OUTPUT

119
gramps2/gramps-mdk.spec.in
View File

@ -1,119 +0,0 @@
%define ver @VERSION@
%define rel @RELEASE@
%define prefix /usr
%define localstatedir /var/lib
# Ensure that internal RPM macros for configure & makeinstall
# will expand properly
%define _prefix %prefix
%define _localstatedir %localstatedir
Summary: Genealogical Research and Analysis Management Programming System.
Name: gramps
Version: %ver
Release: %rel
License: GPL
Group: Applications/Genealogy
Source: http://download.sourceforge.net/gramps/gramps-%{ver}.tar.gz
BuildRoot: /var/tmp/%{name}-%{version}-root
URL: http://gramps.sourceforge.net/
Requires: python >= 2.2
Requires: gnome-python >= 1.99
Requires: gnome-python-gconf >= 1.99
Requires: gnome-python-canvas >= 1.99
Requires: gnome-python-gnomevfs >= 1.99
Requires: pygtk2.0-libglade >= 1.99
BuildRequires: scrollkeeper >= @SCROLLKEEPER_BUILD_REQUIRED@
BuildRequires: automake >= 1.6
BuildRequires: autoconf >= 2.52
BuildRequires: rpm >= 4.1
BuildRequires: desktop-file-utils >= 0.2.92
%description
gramps (Genealogical Research and Analysis Management Programming
System) is a GNOME based genealogy program supporting a Python
based plugin system.
%prep
%setup
%build
if [ ! -f configure ]; then
CFLAGS="$MYCFLAGS" ./autogen.sh $MYARCH_FLAGS --prefix=%prefix \
--localstatedir=%localstatedir --bindir=%{_bindir} \
--mandir=%{_mandir} --libdir=%{_libdir} --datadir=%{_datadir} \
--includedir=%{_includedir} --sysconfdir=%{_sysconfdir}
else
CFLAGS="$MYCFLAGS" %configure
fi
CFLAGS="$RPM_OPT_FLAGS" make
%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor gramps --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category Application \
--add-category Utility \
src/data/gramps.desktop
%find_lang gramps
rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/scrollkeeper/
rm -rf $RPM_BUILD_ROOT/%{_datadir}/mime/application
rm -rf $RPM_BUILD_ROOT/%{_datadir}/mime/{globs,magic,XMLnamespaces}
%clean
rm -rf $RPM_BUILD_ROOT
%files -f gramps.lang
%defattr(-, root, root)
%doc AUTHORS COPYING COPYING-DOCS ChangeLog FAQ INSTALL NEWS README TODO
%doc %{_mandir}/man1/*
%{prefix}/bin/gramps
%{_datadir}/applications/*
%{_datadir}/gramps
%{_datadir}/omf/gramps
%{_datadir}/mime-info/*
%{_datadir}/icons/gnome/48x48/mimetypes/*
%{_sysconfdir}/gconf/schemas/gramps.schemas
%{_datadir}/application-registry/gramps.applications
%{_datadir}/mime/packages/gramps.xml
%post
GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
gconftool-2 --makefile-install-rule \
%{_sysconfdir}/gconf/schemas/gramps.schemas > /dev/null
if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
%postun
if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
%changelog
* Tue Dec 2 2003 Tim Waugh <twaugh@redhat.com>
- More docs.
- Change Copyright: to License:.
* Fri Sep 19 2003 Tim Waugh <twaugh@redhat.com>
- Own %%{_datadir/gramps directory.
- Ship %%{_libdir}/gramps.
* Mon May 20 2003 Donald Peterson <dpeterson@sigmaxi.org>
- Override RPMs default of localstatedir to /var/lib..
This is done in accordance with GNOME and FHS compliance guidelines
(http://fedora.mplug.org/docs/rpm-packaging-guidelines.html)
- Use %find_lang macro to get NLS files
- Set %doc tags on appropriate files
- Remove temporary scrollkeeper-created files from install before packaging
to avoid rpm 4.1 complaints. (These aren't needed in the distribution.)
- Use default scrollkeeper-update scripts
* Mon Mar 24 2003 Alex Roitman <shura@alex.neuro.umn.edu>
- update scrollkeeper dependencies and add post and postun to enable install on a machine without scrollkeeper
* Fri Jun 14 2002 Donald Peterson <dpeterso@engr.ors.edu>
- add scrollkeeper dependencies and some file cleanup

34
gramps2/gramps.spec.in
View File

@ -1,5 +1,9 @@
%define fdr_release %(fdr_release="`rpm -q --queryformat='%{VERSION}' fedora-release | grep -v install 2>/dev/null`" ; if test $? != 0 ; then fdr_release="0" ; fi ; echo "$fdr_release")
%define mdk_release %(mdk_release="`rpm -q --queryformat='%{VERSION}' mandrake-release | grep -v install 2>/dev/null`" ; if test $? != 0 ; then mdk_release="0" ; fi ; echo "$mdk_release")
%define ver @VERSION@
%define rel @RELEASE@
%define prefix /usr
%define localstatedir /var/lib
# Ensure that internal RPM macros for configure & makeinstall
@ -10,7 +14,6 @@
Summary: Genealogical Research and Analysis Management Programming System.
Name: gramps
Version: %ver
Release: %rel
License: GPL
Group: Applications/Genealogy
Source: http://download.sourceforge.net/gramps/gramps-%{ver}.tar.gz
@ -18,17 +21,30 @@ BuildRoot: /var/tmp/%{name}-%{version}-root
URL: http://gramps.sourceforge.net/
Requires: python >= 2.2
Requires: gnome-python2 >= 1.99
Requires: gnome-python2-gconf >= 1.99
Requires: gnome-python2-canvas >= 1.99
Requires: gnome-python2-gnomevfs >= 1.99
Requires: pygtk2 >= 1.99
Requires: pygtk2-libglade >= 1.99
%if %{fdr_release}
Release: %{rel}fdr%(dist_release="`echo "%{fdr_release} * 1" | bc 2>/dev/null`" ; echo "$dist_release")
Distribution: Fedora Core %{fdr_release}
Requires: python >= 2.3
Requires: gnome-python2 >= 2.6.0
Requires: gnome-python2-gconf >= 2.6.0
Requires: gnome-python2-canvas >= 2.6.0
Requires: gnome-python2-gnomevfs >= 2.6.0
Requires: pygtk2 >= 2.4.0
Requires: pygtk2-libglade >= 2.4.0
%else
Release: %{rel}mdk%(mdkver="`awk '{split($4,a,\".\");printf(\"%d%d\",a[1],a[2]);}' /etc/mandrake-release`"; echo "$mdkver")
Distribution: Mandrake Linux %{mdk_release}
Requires: python >= 2.3
Requires: gnome-python >= 2.6.0
Requires: gnome-python-gconf >= 2.6.0
Requires: gnome-python-canvas >= 2.6.0
Requires: gnome-python-gnomevfs >= 2.6.0
Requires: pygtk2.0 >= 2.4.0
Requires: pygtk2.0-libglade >= 2.4.0
%endif
BuildRequires: scrollkeeper >= @SCROLLKEEPER_BUILD_REQUIRED@
BuildRequires: automake >= 1.6
BuildRequires: autoconf >= 2.52
BuildRequires: rpm >= 4.1
BuildRequires: desktop-file-utils >= 0.2.92

26
gramps2/src/AddSpouse.py
View File

@ -191,14 +191,14 @@ class AddSpouse:
relation = self.rel_combo.get_active()
if relation == RelLib.Family.CIVIL_UNION:
if self.person.get_gender() == RelLib.Person.male:
gen = RelLib.Person.male
if self.person.get_gender() == RelLib.Person.MALE:
gen = RelLib.Person.MALE
else:
gen = RelLib.Person.female
elif self.person.get_gender() == RelLib.Person.male:
gen = RelLib.Person.female
gen = RelLib.Person.FEMALE
elif self.person.get_gender() == RelLib.Person.MALE:
gen = RelLib.Person.FEMALE
else:
gen = RelLib.Person.male
gen = RelLib.Person.MALE
person = RelLib.Person()
person.set_gender(gen)
@ -262,7 +262,7 @@ class AddSpouse:
spouse.add_family_handle(self.active_family.get_handle())
self.db.commit_person(spouse,trans)
if self.person.get_gender() == RelLib.Person.male:
if self.person.get_gender() == RelLib.Person.MALE:
self.active_family.set_mother_handle(spouse.get_handle())
self.active_family.set_father_handle(self.person.get_handle())
else:
@ -337,15 +337,15 @@ class AddSpouse:
def set_gender(self):
if self.rel_combo.get_active() == RelLib.Family.CIVIL_UNION:
if self.gender == RelLib.Person.male:
self.sgender = RelLib.Person.female
if self.gender == RelLib.Person.MALE:
self.sgender = RelLib.Person.FEMALE
else:
self.sgender = RelLib.Person.male
self.sgender = RelLib.Person.MALE
else:
if self.gender == RelLib.Person.male:
self.sgender = RelLib.Person.male
if self.gender == RelLib.Person.MALE:
self.sgender = RelLib.Person.MALE
else:
self.sgender = RelLib.Person.female
self.sgender = RelLib.Person.FEMALE
def update_data(self,person = None):
"""

18
gramps2/src/ChooseParents.py
View File

@ -241,20 +241,20 @@ class ChooseParents:
gnome.help_display('gramps-manual','gramps-edit-quick')
def all_males_filter(self,person):
return (person.get_gender() == RelLib.Person.male)
return (person.get_gender() == RelLib.Person.MALE)
def all_females_filter(self,person):
return (person.get_gender() == RelLib.Person.female)
return (person.get_gender() == RelLib.Person.FEMALE)
def likely_father_filter(self,person):
if person.get_gender() != RelLib.Person.male:
if person.get_gender() != RelLib.Person.MALE:
return 0
if self.exclude.has_key(person.get_handle()):
return 0
return self.likely_filter(person)
def likely_mother_filter(self,person):
if person.get_gender() != RelLib.Person.female:
if person.get_gender() != RelLib.Person.FEMALE:
return 0
if self.exclude.has_key(person.get_handle()):
return 0
@ -504,7 +504,7 @@ class ChooseParents:
trans = self.db.transaction_begin()
if self.father or self.mother:
if self.mother and not self.father:
if self.mother.get_gender() == RelLib.Person.male:
if self.mother.get_gender() == RelLib.Person.MALE:
self.father = self.mother
father_handle = self.father.get_handle()
self.mother = None
@ -513,7 +513,7 @@ class ChooseParents:
mother_handle = self.mother.get_handle()
father_handle = None
elif self.father and not self.mother:
if self.father.get_gender() == RelLib.Person.female:
if self.father.get_gender() == RelLib.Person.FEMALE:
self.mother = self.father
self.father = None
mother_handle = self.mother.get_handle()
@ -524,7 +524,7 @@ class ChooseParents:
elif self.mother.get_gender() != self.father.get_gender():
if self.type == "Partners":
self.type = "Unknown"
if self.father.get_gender() == RelLib.Person.female:
if self.father.get_gender() == RelLib.Person.FEMALE:
self.father, self.mother = self.mother, self.father
father_handle = self.father.get_handle()
mother_handle = self.mother.get_handle()
@ -561,7 +561,7 @@ class ChooseParents:
if self.type == RelLib.Family.CIVIL_UNION:
self.parent_relation_changed(self.prel)
elif person.get_gender() == RelLib.Person.male:
elif person.get_gender() == RelLib.Person.MALE:
self.redrawf()
path = self.father_nsort.on_get_path(handle)
top_path = self.father_nsort.on_get_path(name)
@ -582,7 +582,7 @@ class ChooseParents:
class to create a new person."""
person = RelLib.Person()
person.set_gender(RelLib.Person.male)
person.set_gender(RelLib.Person.MALE)
try:
import EditPerson

28
gramps2/src/EditPerson.py
View File

@ -122,7 +122,7 @@ class EditPerson:
self.name_display = NameDisplay.displayer
self.should_guess_gender = (person.get_gramps_id() == '' and
person.get_gender () ==
RelLib.Person.unknown)
RelLib.Person.UNKNOWN)
for key in db.get_place_handles():
p = db.get_place_from_handle(key).get_display_info()
@ -347,9 +347,9 @@ class EditPerson:
AutoComp.fill_combo(self.ntype_field,types)
self.write_primary_name()
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
self.is_male.set_active(1)
elif person.get_gender() == RelLib.Person.female:
elif person.get_gender() == RelLib.Person.FEMALE:
self.is_female.set_active(1)
else:
self.is_unknown.set_active(1)
@ -696,9 +696,9 @@ class EditPerson:
return
gender = self.db.genderStats.guess_gender(unicode(entry.get_text ()))
if gender == RelLib.Person.unknown:
if gender == RelLib.Person.UNKNOWN:
self.is_unknown.set_active(True)
elif gender == RelLib.Person.male:
elif gender == RelLib.Person.MALE:
self.is_male.set_active(True)
else:
self.is_female.set_active(True)
@ -1252,11 +1252,11 @@ class EditPerson:
changed = True
if not self.death.are_equal(self.orig_death):
changed = True
if male and self.person.get_gender() != RelLib.Person.male:
if male and self.person.get_gender() != RelLib.Person.MALE:
changed = True
elif female and self.person.get_gender() != RelLib.Person.female:
elif female and self.person.get_gender() != RelLib.Person.FEMALE:
changed = True
elif unknown and self.person.get_gender() != RelLib.Person.unknown:
elif unknown and self.person.get_gender() != RelLib.Person.UNKNOWN:
changed = True
if text != self.person.get_note():
changed = True
@ -1644,8 +1644,8 @@ class EditPerson:
female = self.is_female.get_active()
unknown = self.is_unknown.get_active()
error = False
if male and self.person.get_gender() != RelLib.Person.male:
self.person.set_gender(RelLib.Person.male)
if male and self.person.get_gender() != RelLib.Person.MALE:
self.person.set_gender(RelLib.Person.MALE)
for temp_family in self.person.get_family_handle_list():
if self.person == temp_family.get_mother_handle():
if temp_family.get_father_handle() != None:
@ -1653,8 +1653,8 @@ class EditPerson:
else:
temp_family.set_mother_handle(None)
temp_family.set_father_handle(self.person)
elif female and self.person.get_gender() != RelLib.Person.female:
self.person.set_gender(RelLib.Person.female)
elif female and self.person.get_gender() != RelLib.Person.FEMALE:
self.person.set_gender(RelLib.Person.FEMALE)
for temp_family in self.person.get_family_handle_list():
if self.person == temp_family.get_father_handle():
if temp_family.get_mother_handle() != None:
@ -1662,8 +1662,8 @@ class EditPerson:
else:
temp_family.set_father_handle(None)
temp_family.set_mother_handle(self.person)
elif unknown and self.person.get_gender() != RelLib.Person.unknown:
self.person.set_gender(RelLib.Person.unknown)
elif unknown and self.person.get_gender() != RelLib.Person.UNKNOWN:
self.person.set_gender(RelLib.Person.UNKNOWN)
for temp_family in self.person.get_family_handle_list():
if self.person == temp_family.get_father_handle():
if temp_family.get_mother_handle() != None:

16
gramps2/src/FamilyView.py
View File

@ -651,10 +651,10 @@ class FamilyView:
def add_spouse(self,obj):
person = RelLib.Person()
if self.person.get_gender() == RelLib.Person.male:
person.set_gender(RelLib.Person.female)
if self.person.get_gender() == RelLib.Person.MALE:
person.set_gender(RelLib.Person.FEMALE)
else:
person.set_gender(RelLib.Person.male)
person.set_gender(RelLib.Person.MALE)
try:
EditPerson.EditPerson(self.parent, person, self.parent.db,
self.new_spouse_after_edit)
@ -688,7 +688,7 @@ class FamilyView:
self.parent.db.commit_person(epo.person,trans)
self.parent.db.commit_person(self.person,trans)
if self.person.get_gender() == RelLib.Person.male:
if self.person.get_gender() == RelLib.Person.MALE:
self.family.set_mother_handle(epo.person.get_handle())
self.family.set_father_handle(self.person.get_handle())
else:
@ -735,7 +735,7 @@ class FamilyView:
self.family = RelLib.Family()
self.parent.db.add_family(self.family,trans)
person.add_family_handle(self.family.get_handle())
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
self.family.set_father_handle(person)
else:
self.family.set_mother_handle(person)
@ -754,7 +754,7 @@ class FamilyView:
self.family = RelLib.Family()
self.parent.db.add_family(self.family,trans)
self.person.add_family_handle(self.family.get_handle())
if self.person.get_gender() == RelLib.Person.male:
if self.person.get_gender() == RelLib.Person.MALE:
self.family.set_father_handle(self.person.get_handle())
else:
self.family.set_mother_handle(self.person.get_handle())
@ -1435,7 +1435,7 @@ class FamilyView:
sel_data.set(sel_data.target, bits_per, data)
def north_american(self,val):
if self.person.get_gender() == RelLib.Person.male:
if self.person.get_gender() == RelLib.Person.MALE:
pname = self.person.get_primary_name()
return (pname.get_surname_prefix(),pname.get_surname())
elif self.family:
@ -1468,7 +1468,7 @@ class FamilyView:
def icelandic(self,val):
fname = ""
if self.person.get_gender() == RelLib.Person.male:
if self.person.get_gender() == RelLib.Person.MALE:
fname = self.person.get_primary_name().get_first_name()
elif self.family:
f = self.family.get_father_handle()

4
gramps2/src/GenericFilter.py
View File

@ -330,7 +330,7 @@ class IsFemale(Rule):
return _('Matches all females')
def apply(self,db,p_id):
return db.get_person_from_handle(p_id).get_gender() == RelLib.Person.female
return db.get_person_from_handle(p_id).get_gender() == RelLib.Person.FEMALE
#-------------------------------------------------------------------------
#
@ -966,7 +966,7 @@ class IsMale(Rule):
return _('Matches all males')
def apply(self,db,p_id):
return db.get_person_from_handle(p_id).get_gender() == RelLib.Person.male
return db.get_person_from_handle(p_id).get_gender() == RelLib.Person.MALE
#-------------------------------------------------------------------------
#

8
gramps2/src/MergeData.py
View File

@ -185,7 +185,7 @@ class MergePeople:
widget.clear()
for fam in person.get_family_handle_list():
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
spouse = fam.get_mother_handle()
else:
spouse = fam.get_father_handle()
@ -366,7 +366,7 @@ class MergePeople:
Utils.destroy_passed_object(self.top)
def find_family(self,family):
if self.p1.get_gender() == RelLib.Person.male:
if self.p1.get_gender() == RelLib.Person.MALE:
mother = family.get_mother_handle()
father = self.p1.get_handle()
else:
@ -471,7 +471,7 @@ class MergePeople:
else:
if src_family not in self.p1.get_family_handle_list():
self.p1.add_family_handle(src_family)
if self.p1.get_gender() == RelLib.Person.male:
if self.p1.get_gender() == RelLib.Person.MALE:
src_family.set_father_handle(self.p1)
else:
src_family.set_mother_handle(self.p1)
@ -587,7 +587,7 @@ def compare_people(p1,p2):
for f1 in p1.get_family_handle_list():
for f2 in p2.get_family_handle_list():
if p1.get_gender() == RelLib.Person.female:
if p1.get_gender() == RelLib.Person.FEMALE:
father1 = f1.get_father_handle()
father2 = f2.get_father_handle()
if father1 and father2:

6
gramps2/src/ReadGedcom.py
View File

@ -931,11 +931,11 @@ class GedcomParser:
note = self.parse_note(matches,self.person,1,note)
elif matches[1] == "SEX":
if matches[2] == '':
self.person.set_gender(RelLib.Person.unknown)
self.person.set_gender(RelLib.Person.UNKNOWN)
elif matches[2][0] == "M":
self.person.set_gender(RelLib.Person.male)
self.person.set_gender(RelLib.Person.MALE)
else:
self.person.set_gender(RelLib.Person.female)
self.person.set_gender(RelLib.Person.FEMALE)
elif matches[1] in [ "BAPL", "ENDL", "SLGC" ]:
lds_ord = RelLib.LdsOrd()
if matches[1] == "BAPL":

6
gramps2/src/ReadXML.py
View File

@ -1219,11 +1219,11 @@ class GrampsParser:
def stop_gender(self,tag):
t = tag
if t == "M":
self.person.set_gender (RelLib.Person.male)
self.person.set_gender (RelLib.Person.MALE)
elif t == "F":
self.person.set_gender (RelLib.Person.female)
self.person.set_gender (RelLib.Person.FEMALE)
else:
self.person.set_gender (RelLib.Person.unknown)
self.person.set_gender (RelLib.Person.UNKNOWN)
def stop_stitle(self,tag):
self.source.set_title(tag)

32
gramps2/src/RelLib.py
View File

@ -340,7 +340,7 @@ class Person(PrimaryObject,SourceNote):
self.media_list = []
self.nickname = ""
self.alternate_names = []
self.gender = Person.unknown
self.gender = Person.UNKNOWN
self.death_handle = None
self.birth_handle = None
self.address_list = []
@ -521,9 +521,9 @@ class Person(PrimaryObject,SourceNote):
@param gender: Assigns the Person's gender to one of the
following constants::
Person.male
Person.female
Person.unknown
Person.MALE
Person.FEMALE
Person.UNKNOWN
@type gender: int
"""
# if the db object has been assigned, update the
@ -539,9 +539,9 @@ class Person(PrimaryObject,SourceNote):
Returns the gender of the Person
@returns: Returns one of the following constants::
Person.male
Person.female
Person.unknown
Person.MALE
Person.FEMALE
Person.UNKNOWN
@rtype: int
"""
return self.gender
@ -3112,11 +3112,11 @@ class GenderStats:
else:
increment = -1
if gender == Person.male:
if gender == Person.MALE:
male += increment
elif gender == Person.female:
elif gender == Person.FEMALE:
female += increment
elif gender == Person.unknown:
elif gender == Person.UNKNOWN:
unknown += increment
self.stats[name] = (male, female, unknown)
@ -3128,20 +3128,20 @@ class GenderStats:
def guess_gender (self, name):
name = self._get_key_from_name (name)
if not name or not self.stats.has_key (name):
return Person.unknown
return Person.UNKNOWN
(male, female, unknown) = self.stats[name]
if unknown == 0:
if male and not female:
return Person.male
return Person.MALE
if female and not male:
return Person.female
return Person.FEMALE
if male > (2 * female):
return Person.male
return Person.MALE
if female > (2 * male):
return Person.female
return Person.FEMALE
return Person.unknown
return Person.UNKNOWN

8
gramps2/src/Relationship.py
View File

@ -322,22 +322,22 @@ class RelationshipCalculator:
if firstRel == 0:
if secondRel == 0:
return ('',common)
elif other_person.get_gender() == RelLib.Person.male:
elif other_person.get_gender() == RelLib.Person.MALE:
return (self.get_father(secondRel),common)
else:
return (self.get_mother(secondRel),common)
elif secondRel == 0:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_son(firstRel),common)
else:
return (self.get_daughter(firstRel),common)
elif firstRel == 1:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_uncle(secondRel),common)
else:
return (self.get_aunt(secondRel),common)
elif secondRel == 1:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_nephew(firstRel-1),common)
else:
return (self.get_niece(firstRel-1),common)

124
gramps2/src/ReportUtils.py
View File

@ -352,6 +352,17 @@ def roman(num):
num -= vals[i] * amount
return retval
#-------------------------------------------------------------------------
#
#
#
#-------------------------------------------------------------------------
def place_name(db,place_handle):
if place_handle:
place = db.get_place_from_handle(place_handle).get_title()
else:
place = ""
#-------------------------------------------------------------------------
#
# Functions commonly used in reports
@ -448,14 +459,14 @@ def born_died_str(database,person,endnotes=None,name_object=None,person_name=Non
if person_name == None:
person_name = _nd.display_name(name_object)
elif person_name == 0:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
person_name = _('He')
else:
person_name = _('She')
bdate,bplace,ddate,dplace = get_birth_death_strings(database,person)
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
if bdate:
if bplace:
if ddate:
@ -754,7 +765,7 @@ def married_str(database,person,spouse,event,endnotes=None):
text = ""
if date and place:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
text = _('He married %(spouse)s %(date)s in %(place)s%(endnotes)s.') % {
'spouse' : spouse_name,
'endnotes' : endnotes(event),
@ -767,7 +778,7 @@ def married_str(database,person,spouse,event,endnotes=None):
'endnotes' : endnotes(event),
'place' : place}
elif date:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
text = _('He married %(spouse)s %(date)s%(endnotes)s.') % {
'spouse' : spouse_name,
'endnotes' : endnotes(event),
@ -778,7 +789,7 @@ def married_str(database,person,spouse,event,endnotes=None):
'endnotes' : endnotes(event),
'place' : place,}
elif place:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
text = _('He married %(spouse)s in %(place)s%(endnotes)s.') % {
'spouse' : spouse_name,
'endnotes' : endnotes(event),
@ -789,7 +800,7 @@ def married_str(database,person,spouse,event,endnotes=None):
'endnotes' : endnotes(event),
'place' : place}
else:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
text = _('He married %(spouse)s%(endnotes)s.') % {
'spouse' : spouse_name,
'endnotes' : endnotes(event) }
@ -809,8 +820,8 @@ def child_str(person,person_name=0,father_name="",mother_name="",dead=0):
"He/She is/was the son/daughter of father_name and mother_name"
Missing information will be omitted without loss of readability.
@param person_gender: Person.male, Person.female, or Person.unknown
@type person: Person.male, Person.female, or Person.unknown
@param person_gender: Person.MALE, Person.FEMALE, or Person.UNKNOWN
@type person: Person.MALE, Person.FEMALE, or Person.UNKNOWN~
@param father_name: String to use for father's name
@type father_name: unicode
@param mother_name: String to use for mother's name
@ -824,14 +835,14 @@ def child_str(person,person_name=0,father_name="",mother_name="",dead=0):
if person_name == None:
person_name = _nd.display_name(person.get_primary_name())
elif person_name == 0:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
person_name = _('He')
else:
person_name = _('She')
text = ""
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
if mother_name and father_name:
if dead:
text = _("He was the son of %(father)s and %(mother)s.") % {
@ -879,7 +890,14 @@ def child_str(person,person_name=0,father_name="",mother_name="",dead=0):
else:
text = _("She is the daughter of %(father)s.") % {
'father' : father_name, }
return text
def find_spouse(person,family):
if person.get_handle() == family.get_father_handle():
spouse_id = family.get_mother_handle()
else:
spouse_id = family.get_mother_handle()
return spouse_id
if text:
text = text + " "
return text
@ -900,7 +918,7 @@ def born_str(database,person,person_name=None,empty_date="",empty_place=""):
if person_name == None:
person_name = _nd.display_name(person.get_primary_name())
elif person_name == 0:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
person_name = _('He')
else:
person_name = _('She')
@ -910,7 +928,7 @@ def born_str(database,person,person_name=None,empty_date="",empty_place=""):
bdate,bplace,bdate_full,ddate,dplace,ddate_full = \
get_birth_death_strings(database,person,empty_date,empty_place)
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
if bdate and bdate_full:
if bplace: #male, date, place
text = _("%(male_name)s "
@ -998,7 +1016,7 @@ def died_str(database,person,person_name=None,empty_date="",empty_place="",
if person_name == None:
person_name = _nd.display_name(person.get_primary_name())
elif person_name == 0:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
person_name = _('He')
else:
person_name = _('She')
@ -1008,7 +1026,7 @@ def died_str(database,person,person_name=None,empty_date="",empty_place="",
bdate,bplace,bdate_full,ddate,dplace,ddate_full = \
get_birth_death_strings(database,person,empty_date,empty_place)
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
if ddate and ddate_full:
if dplace:
if not age_units: #male, date, place, no age
@ -1289,7 +1307,7 @@ def buried_str(database,person,person_name=None,empty_date="",empty_place=""):
if person_name == None:
person_name = _nd.display_name(person.get_primary_name())
elif person_name == 0:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
person_name = _('He')
else:
person_name = _('She')
@ -1317,7 +1335,7 @@ def buried_str(database,person,person_name=None,empty_date="",empty_place=""):
else:
return text
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
if bdate and bdate_full:
if bplace: #male, date, place
text = _("%(male_name)s "
@ -1374,69 +1392,13 @@ def buried_str(database,person,person_name=None,empty_date="",empty_place=""):
text = text + " "
return text
#-------------------------------------------------------------------------
#
#
#
#-------------------------------------------------------------------------
if __name__ == "__main__":
import BaseDoc
import OpenOfficeDoc
_rtyle = {
RelLib.Family.MARRIED : _("Married"),
RelLib.Family.UNMARRIED : _("Unmarried"),
RelLib.Family.CIVIL_UNION : _("Civil Union"),
RelLib.Family.UNKNOWN : _("Unknown"),
RelLib.Family.OTHER : _("Other"),
}
sheet = BaseDoc.StyleSheet()
paper = BaseDoc.PaperStyle("Letter",27.94,21.59)
doc = OpenOfficeDoc.OpenOfficeDoc(sheet,paper,None)
font = BaseDoc.FontStyle()
font.set_size(10)
para = BaseDoc.ParagraphStyle()
para.set_font(font)
sheet.add_style('Normal', para)
g = BaseDoc.GraphicsStyle()
g.set_fill_color((0,255,0))
g.set_paragraph_style('Normal')
g.set_line_width(1)
doc.add_draw_style("green",g)
g = BaseDoc.GraphicsStyle()
g.set_fill_color((255,0,0))
g.set_paragraph_style('Normal')
g.set_line_width(1)
doc.add_draw_style("red",g)
g = BaseDoc.GraphicsStyle()
g.set_fill_color((0,0,255))
g.set_paragraph_style('Normal')
g.set_line_width(1)
doc.add_draw_style("blue",g)
g = BaseDoc.GraphicsStyle()
g.set_fill_color((255,255,0))
g.set_paragraph_style('Normal')
g.set_line_width(1)
doc.add_draw_style("yellow",g)
g = BaseDoc.GraphicsStyle()
g.set_fill_color((0,0,0))
g.set_paragraph_style('Normal')
g.set_line_width(1)
doc.add_draw_style("black",g)
doc.open("foo.sxw")
doc.init()
chart_data = [
('red',250,'red label'),
('green',35,'green label'),
('blue', 158, 'blue label'),
('yellow', 100, 'yellow label'),
]
draw_pie_chart(doc, 4, 4, 3, chart_data)
draw_legend(doc, 7.5, 2, chart_data)
draw_vertical_bar_graph(doc, "black", 2, 10, 8, 12, chart_data)
doc.close()
def relationship_name(type):
return _rtype.get(type)

20
gramps2/src/SelectChild.py
View File

@ -108,7 +108,7 @@ class SelectChild:
fname = NameDisplay.displayer.display(self.person)
label = _("Relationship to %s") % fname
if self.person.get_gender() == RelLib.Person.male:
if self.person.get_gender() == RelLib.Person.MALE:
self.xml.get_widget("flabel").set_text(label)
self.xml.get_widget("mrel_combo").set_sensitive(0)
else:
@ -246,9 +246,9 @@ class SelectChild:
for idval in person_list:
person = self.db.get_person_from_handle(idval)
name = NameDisplay.displayer.display(person)
if person.gender == RelLib.Person.male:
if person.gender == RelLib.Person.MALE:
gender = _("male")
elif person.gender == RelLib.Person.female:
elif person.gender == RelLib.Person.FEMALE:
gender = _("female")
else:
gender = _("unknown")
@ -304,7 +304,7 @@ class SelectChild:
self.family = RelLib.Family()
self.db.add_family(self.family,trans)
self.person.add_family_handle(self.family.get_handle())
if self.person.get_gender() == RelLib.Person.male:
if self.person.get_gender() == RelLib.Person.MALE:
self.family.set_father_handle(self.person)
else:
self.family.set_mother_handle(self.person)
@ -319,13 +319,13 @@ class SelectChild:
mrel = const.child_relations.find_value(self.mrel.get_text())
mother = self.db.get_person_from_handle(self.family.get_mother_handle())
if mother and mother.get_gender() != RelLib.Person.female:
if mother and mother.get_gender() != RelLib.Person.FEMALE:
if mrel == "Birth":
mrel = "Unknown"
frel = const.child_relations.find_value(self.frel.get_text())
father = self.db.get_person_from_handle(self.family.get_father_handle())
if father and father.get_gender() !=RelLib.Person.male:
if father and father.get_gender() !=RelLib.Person.MALE:
if frel == "Birth":
frel = "Unknown"
@ -343,7 +343,7 @@ class SelectChild:
self.redraw_child_list(not obj.get_active())
def north_american(self,val):
if self.person.get_gender() == RelLib.Person.male:
if self.person.get_gender() == RelLib.Person.MALE:
return self.person.get_primary_name().get_surname()
elif self.family:
f = self.family.get_father_handle()
@ -374,7 +374,7 @@ class SelectChild:
def icelandic(self,val):
fname = ""
if self.person.get_gender() == RelLib.Person.male:
if self.person.get_gender() == RelLib.Person.MALE:
fname = self.person.get_primary_name().get_first_name()
elif self.family:
f = self.family.get_father_handle()
@ -455,13 +455,13 @@ class EditRel:
def on_ok_clicked(self,obj):
mrel = const.child_relations.find_value(self.mentry.get_text())
mother = self.db.get_person_from_handle(self.family.get_mother_handle())
if mother and mother.get_gender() != RelLib.Person.female:
if mother and mother.get_gender() != RelLib.Person.FEMALE:
if mrel == "Birth":
mrel = "Unknown"
frel = const.child_relations.find_value(self.fentry.get_text())
father = self.db.get_person_from_handle(self.family.get_father_handle())
if father and father.get_gender() !=RelLib.Person.male:
if father and father.get_gender() !=RelLib.Person.MALE:
if frel == "Birth":
frel = "Unknown"

4
gramps2/src/WriteGedcom.py
View File

@ -785,9 +785,9 @@ class GedcomWriter:
for name in person.get_alternate_names():
self.write_person_name(name,"")
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
self.writeln("1 SEX M")
elif person.get_gender() == RelLib.Person.female:
elif person.get_gender() == RelLib.Person.FEMALE:
self.writeln("1 SEX F")
if not restricted:

4
gramps2/src/WriteXML.py
View File

@ -254,9 +254,9 @@ class XmlWriter:
count += 1
self.write_id("person",person,2)
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
self.write_line("gender","M",3)
elif person.get_gender() == RelLib.Person.female:
elif person.get_gender() == RelLib.Person.FEMALE:
self.write_line("gender","F",3)
else:
self.write_line("gender","U",3)

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

@ -176,7 +176,7 @@ class AncestorReport(Report.Report):
if place[-1:] == '.':
place = place[:-1]
if date_text != "" or place_handle:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
male = 1
else:
male = 0

18
gramps2/src/plugins/Ancestors.py
View File

@ -577,21 +577,21 @@ class ComprehensiveAncestorsReport (Report.Report):
if not mother_handle and not father_handle:
pass
elif not father_handle:
if gender == RelLib.Person.female:
if gender == RelLib.Person.FEMALE:
ret += _("She is the daughter of %(mother)s.") % \
{'mother': mothername}
else:
ret += _("He is the son of %(mother)s.") % \
{'mother': mothername}
elif not mother_handle:
if gender == RelLib.Person.female:
if gender == RelLib.Person.FEMALE:
ret += _("She is the daughter of %(father)s.") % \
{'father': fathername}
else:
ret += _("He is the son of %(father)s.") % \
{'father': fathername}
else:
if gender == RelLib.Person.female:
if gender == RelLib.Person.FEMALE:
ret += \
_("She is the daughter of %(father)s and %(mother)s.")%\
{'father': fathername,
@ -618,12 +618,12 @@ class ComprehensiveAncestorsReport (Report.Report):
return t
gender = person.get_gender ()
if gender == RelLib.Person.female:
if gender == RelLib.Person.FEMALE:
if name.get_type () == 'Married Name':
return _('Mrs.')
return _('Miss')
elif gender == RelLib.Person.male:
elif gender == RelLib.Person.MALE:
return _('Mr.')
else:
return _('(gender unknown)')
@ -756,7 +756,7 @@ class ComprehensiveAncestorsReport (Report.Report):
break
if not first_rel:
if gender == RelLib.Person.female:
if gender == RelLib.Person.FEMALE:
ret += _(' She later married %(name)s') % \
{'name': self.person_name (spouse_handle)}
else:
@ -766,7 +766,7 @@ class ComprehensiveAncestorsReport (Report.Report):
elif (listing_children or
spouse == mother or
family != from_family):
if gender == RelLib.Person.female:
if gender == RelLib.Person.FEMALE:
ret += _(' She married %(name)s') % \
{'name': self.person_name (spouse_handle)}
else:
@ -777,14 +777,14 @@ class ComprehensiveAncestorsReport (Report.Report):
ret += self.event_info (marriage)
else: # Not a marriage
if not first_rel:
if gender == RelLib.Person.female:
if gender == RelLib.Person.FEMALE:
ret += _(' She later had a relationship with %(name)s') % \
{'name': self.person_name (spouse_handle)}
else:
ret += _(' He later had a relationship with %(name)s') % \
{'name': self.person_name (spouse_handle)}
else:
if gender == RelLib.Person.female:
if gender == RelLib.Person.FEMALE:
ret += _(' She had a relationship with %(name)s') % \
{'name': self.person_name (spouse_handle)}
else:

10
gramps2/src/plugins/Check.py
View File

@ -260,12 +260,12 @@ class CheckIntegrity:
if not father_handle and not mother_handle:
continue
elif not father_handle:
if mother.get_gender() == RelLib.Person.male:
if mother.get_gender() == RelLib.Person.MALE:
family.set_father_handle(mother_handle)
family.set_mother_handle(None)
self.db.commit_family(family,self.trans)
elif not mother_handle:
if father.get_gender() == RelLib.Person.female:
if father.get_gender() == RelLib.Person.FEMALE:
family.set_mother_handle(father_handle)
family.set_father_handle(None)
self.db.commit_family(family,self.trans)
@ -273,11 +273,11 @@ class CheckIntegrity:
fgender = father.get_gender()
mgender = mother.get_gender()
if type != RelLib.Family.CIVIL_UNION:
if fgender == mgender and fgender != RelLib.Person.unknown:
if fgender == mgender and fgender != RelLib.Person.UNKNOWN:
family.set_relationship(RelLib.Family.CIVIL_UNION)
self.fam_rel.append(family_handle)
self.db.commit_family(family,self.trans)
elif fgender == RelLib.Person.female or mgender == RelLib.Person.male:
elif fgender == RelLib.Person.FEMALE or mgender == RelLib.Person.MALE:
family.set_father_handle(mother_handle)
family.set_mother_handle(father_handle)
self.fam_rel.append(family_handle)
@ -285,7 +285,7 @@ class CheckIntegrity:
elif fgender != mgender:
family.set_relationship(RelLib.Family.UNKNOWN)
self.fam_rel.append(family_handle)
if fgender == RelLib.Person.female or mgender == RelLib.Person.male:
if fgender == RelLib.Person.FEMALE or mgender == RelLib.Person.MALE:
family.set_father_handle(mother_handle)
family.set_mother_handle(father_handle)
self.db.commit_family(family,self.trans)

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

@ -329,7 +329,7 @@ class DetAncestorReport(Report.Report):
if self.firstName:
firstName = person.get_primary_name().get_first_name()
elif person.get_gender() == RelLib.Person.male:
elif person.get_gender() == RelLib.Person.MALE:
firstName = _("He")
else:
firstName = _("She")
@ -542,7 +542,7 @@ class DetAncestorReport(Report.Report):
mother= ""
if father or mother:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
if father:
if mother:
self.doc.write_text(_(" %s is the son of %s and %s.") % \
@ -585,7 +585,7 @@ class DetAncestorReport(Report.Report):
fam_num= fam_num + 1
spouse= ""
t= ""
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
if fam.get_mother_handle():
mother = self.database.get_person_from_handle(fam.get_mother_handle())
spouse = mother.get_primary_name().get_regular_name()
@ -665,7 +665,7 @@ class DetAncestorReport(Report.Report):
for fam_id in famList:
fam = self.database.get_family_from_handle(fam_id)
person= ""
if mate.get_gender() == RelLib.Person.male:
if mate.get_gender() == RelLib.Person.MALE:
if fam.get_mother_handle():
ind_id= fam.get_mother_handle()
ind = self.database.get_person_from_handle(ind_id)
@ -700,7 +700,7 @@ class DetAncestorReport(Report.Report):
self.doc.end_paragraph()
if self.listChildren \
and mate.get_gender() == RelLib.Person.male:
and mate.get_gender() == RelLib.Person.MALE:
self.write_children(fam)
#--------------------------------------------------------------------
@ -755,7 +755,7 @@ class DetAncestorReport(Report.Report):
self.genIDs[person_handle]= key
dupPerson= self.write_person(key)
if dupPerson == 0: # Is this a duplicate ind record
if person.get_gender() == RelLib.Person.female and \
if person.get_gender() == RelLib.Person.FEMALE and \
self.listChildren and \
len(person.get_family_handle_list()) > 0:
family_handle = person.get_family_handle_list()[0]

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

@ -332,7 +332,7 @@ class DetDescendantReport(Report.Report):
if self.firstName:
firstName = person.get_primary_name().get_first_name()
elif person.get_gender() == RelLib.Person.male:
elif person.get_gender() == RelLib.Person.MALE:
firstName = _("He")
else:
firstName = _("She")
@ -549,7 +549,7 @@ class DetDescendantReport(Report.Report):
mother = ""
if father or mother:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
if father:
if mother:
self.doc.write_text(_(" %s is the son of %s and %s.") % \
@ -587,7 +587,7 @@ class DetDescendantReport(Report.Report):
fam = self.database.get_family_from_handle(fam_id)
fam_num= fam_num + 1
spouse = ""
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
mother_handle = fam.get_mother_handle()
if mother_handle:
spouse = self.database.get_person_from_handle(mother_handle).get_primary_name().get_regular_name()
@ -667,7 +667,7 @@ class DetDescendantReport(Report.Report):
for fam_id in person.get_family_handle_list():
fam = self.database.get_family_from_handle(fam_id)
mate = ""
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
heshe = _("She")
mother_handle = fam.get_mother_handle()
if mother_handle:
@ -729,7 +729,7 @@ class DetDescendantReport(Report.Report):
if len(famList):
for fam_id in famList:
fam = self.database.get_family_from_handle(fam_id)
if self.start_person.get_gender() == RelLib.Person.male:
if self.start_person.get_gender() == RelLib.Person.MALE:
mother_handle = fam.get_mother_handle()
if mother_handle:
spouseName = self.database.get_person_from_handle(mother_handle).get_primary_name().get_first_name()

4
gramps2/src/plugins/FamilyGroup.py
View File

@ -159,7 +159,7 @@ class FamilyGroup(Report.Report):
person = self.database.get_person_from_handle(person_handle)
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
the_id = _("Husband")
else:
the_id = _("Wife")
@ -307,7 +307,7 @@ class FamilyGroup(Report.Report):
self.doc.start_row()
self.doc.start_cell('FGR-TextChild1')
self.doc.start_paragraph('FGR-ChildText')
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
self.doc.write_text("%dM" % index)
else:
self.doc.write_text("%dF" % index)

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

@ -307,7 +307,7 @@ class GraphViz:
else:
style = 'color'
gender = person.get_gender()
if gender == person.male:
if gender == person.MALE:
self.f.write('%s=%s, ' % (style, self.colors['male']))
elif gender == person.female:
self.f.write('%s=%s, ' % (style, self.colors['female']))

12
gramps2/src/plugins/ImportGeneWeb.py
View File

@ -174,7 +174,7 @@ class GeneWebParser:
idx = 1;
print "\nHusband:"
(idx,husband) = self.parse_person(fields,idx,RelLib.Person.male,None)
(idx,husband) = self.parse_person(fields,idx,RelLib.Person.MALE,None)
if husband:
self.current_husband_handle = husband.get_handle()
self.current_family.set_father_handle(husband.get_handle())
@ -184,7 +184,7 @@ class GeneWebParser:
print "Marriage:"
idx = self.parse_marriage(fields,idx)
print "Wife:"
(idx,wife) = self.parse_person(fields,idx,RelLib.Person.female,None)
(idx,wife) = self.parse_person(fields,idx,RelLib.Person.FEMALE,None)
if wife:
self.current_family.set_mother_handle(wife.get_handle())
self.db.commit_family(self.current_family,self.trans)
@ -204,9 +204,9 @@ class GeneWebParser:
def read_witness_line(self,line,fields):
print "Witness:"
if fields[1] == "m:":
self.parse_person(fields,2,RelLib.Person.male,None)
self.parse_person(fields,2,RelLib.Person.MALE,None)
elif fields[1] == "f:":
self.parse_person(fields,2,RelLib.Person.female,None)
self.parse_person(fields,2,RelLib.Person.FEMALE,None)
else:
self.parse_person(fields,1,None,None)
return None
@ -233,9 +233,9 @@ class GeneWebParser:
print "Child:"
child = None
if fields[1] == "h":
(idx,child) = self.parse_person(fields,2,RelLib.Person.male,father_surname)
(idx,child) = self.parse_person(fields,2,RelLib.Person.MALE,father_surname)
elif fields[1] == "f":
(idx,child) = self.parse_person(fields,2,RelLib.Person.female,father_surname)
(idx,child) = self.parse_person(fields,2,RelLib.Person.FEMALE,father_surname)
else:
(idx,child) = self.parse_person(fields,1,None,father_surname)

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

@ -415,7 +415,7 @@ class IndivCompleteReport(Report.Report):
self.doc.start_row()
self.normal_cell("%s:" % _("Gender"))
if self.start_person.get_gender() == RelLib.Person.male:
if self.start_person.get_gender() == RelLib.Person.MALE:
self.normal_cell(_("Male"))
else:
self.normal_cell(_("Female"))

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

@ -242,7 +242,7 @@ class IndivSummary(Report.Report):
self.doc.start_cell("IVS-NormalCell")
self.doc.start_paragraph("IVS-Normal")
if self.start_person.get_gender() == RelLib.Person.male:
if self.start_person.get_gender() == RelLib.Person.MALE:
self.doc.write_text(_("Male"))
else:
self.doc.write_text(_("Female"))

6
gramps2/src/plugins/Merge.py
View File

@ -186,7 +186,7 @@ class Merge:
for p1_id in self.person_list:
p1 = self.db.get_person_from_handle(p1_id)
key = self.gen_key(p1.get_primary_name().get_surname())
if p1.get_gender() == RelLib.Person.male:
if p1.get_gender() == RelLib.Person.MALE:
if males.has_key(key):
males[key].append(p1_id)
else:
@ -207,7 +207,7 @@ class Merge:
num = num + 1
key = self.gen_key(p1.get_primary_name().get_surname())
if p1.get_gender() == RelLib.Person.male:
if p1.get_gender() == RelLib.Person.MALE:
remaining = males[key]
else:
remaining = females[key]
@ -577,7 +577,7 @@ class Merge:
f1 = self.db.get_family_from_handle(f1_id)
for f2_id in p2.get_family_handle_list():
f2 = self.db.get_family_from_handle(f2_id)
if p1.get_gender() == RelLib.Person.female:
if p1.get_gender() == RelLib.Person.FEMALE:
father1_id = f1.get_father_handle()
father2_id = f2.get_father_handle()
if father1_id and father2_id:

1513
gramps2/src/plugins/NavWebPage.py Normal file
View File

File diff suppressed because it is too large Load Diff

4
gramps2/src/plugins/RelCalc.py
View File

@ -105,9 +105,9 @@ class RelCalc:
else:
bdate = ""
name = p.get_primary_name()
if p.get_gender() == RelLib.Person.male:
if p.get_gender() == RelLib.Person.MALE:
gender = _("male")
elif p.get_gender() == RelLib.Person.female:
elif p.get_gender() == RelLib.Person.FEMALE:
gender = _("female")
else:
gender = _("unknown")

18
gramps2/src/plugins/StatisticsChart.py
View File

@ -76,9 +76,9 @@ class _options:
(SORT_KEY, "Item name", _("Item name"))
]
genders = [
(Person.unknown, "Both", _("Both")),
(Person.male, "Men", _("Men")),
(Person.female, "Women", _("Women"))
(Person.UNKNOWN, "Both", _("Both")),
(Person.MALE, "Men", _("Men")),
(Person.FEMALE, "Women", _("Women"))
]
@ -154,9 +154,9 @@ class Extract:
"return gender for given person"
# TODO: why there's no Person.getGenderName?
# It could be used by getDisplayInfo & this...
if person.gender == Person.male:
if person.gender == Person.MALE:
return [_("Men")]
if person.gender == Person.female:
if person.gender == Person.FEMALE:
return [_("Women")]
return [_("Gender unknown")]
@ -392,7 +392,7 @@ class Extract:
person = db.get_person_from_handle(person_handle)
# check whether person has suitable gender
if person.gender != genders and genders != Person.unknown:
if person.gender != genders and genders != Person.UNKNOWN:
continue
# check whether birth year is within required range
@ -453,9 +453,9 @@ class StatisticsChart(Report.Report):
gender = options['gender']
# title needs both data extraction method name + gender name
if gender == Person.male:
if gender == Person.MALE:
genders = _("Men")
elif gender == Person.female:
elif gender == Person.FEMALE:
genders = _("Women")
else:
genders = None
@ -704,7 +704,7 @@ class StatisticsChartOptions(ReportOptions.ReportOptions):
def set_new_options(self):
# Options specific for this report
self.options_dict = {
'gender' : Person.unknown,
'gender' : Person.UNKNOWN,
'sortby' : _options.SORT_VALUE,
'reverse' : 0,
'year_from' : 1700,

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

@ -99,7 +99,7 @@ def build_report(database,person):
missing_bday = missing_bday + 1
else:
missing_bday = missing_bday + 1
if person.get_gender() == RelLib.Person.female:
if person.get_gender() == RelLib.Person.FEMALE:
females = females + 1
else:
males = males + 1

108
gramps2/src/plugins/Verify.py
View File

@ -167,60 +167,60 @@ class Verify:
if byear>0 and bapyear>0:
if byear > bapyear:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
error.write( _("Baptized before birth: %(male_name)s born %(byear)d, baptized %(bapyear)d.\n") % {
'male_name' : idstr, 'byear' : byear, 'bapyear' : bapyear } )
if person.get_gender() == RelLib.Person.female:
if person.get_gender() == RelLib.Person.FEMALE:
error.write( _("Baptized before birth: %(female_name)s born %(byear)d, baptized %(bapyear)d.\n") % {
'female_name' : idstr, 'byear' : byear, 'bapyear' : bapyear } )
if byear < bapyear:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
warn.write( _("Baptized late: %(male_name)s born %(byear)d, baptized %(bapyear)d.\n") % {
'male_name' : idstr, 'byear' : byear, 'bapyear' : bapyear } )
if person.get_gender() == RelLib.Person.female:
if person.get_gender() == RelLib.Person.FEMALE:
warn.write( _("Baptized late: %(female_name)s born %(byear)d, baptized %(bapyear)d.\n") % {
'female_name' : idstr, 'byear' : byear, 'bapyear' : bapyear } )
if dyear>0 and buryear>0:
if dyear > buryear:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
error.write( _("Buried before death: %(male_name)s died %(dyear)d, buried %(buryear)d.\n") % {
'male_name' : idstr, 'dyear' : dyear, 'buryear' : buryear } )
if person.get_gender() == RelLib.Person.female:
if person.get_gender() == RelLib.Person.FEMALE:
error.write( _("Buried before death: %(female_name)s died %(dyear)d, buried %(buryear)d.\n") % {
'female_name' : idstr, 'dyear' : dyear, 'buryear' : buryear } )
if dyear < buryear:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
warn.write( _("Buried late: %(male_name)s died %(dyear)d, buried %(buryear)d.\n") % {
'male_name' : idstr, 'dyear' : dyear, 'buryear' : buryear } )
if person.get_gender() == RelLib.Person.female:
if person.get_gender() == RelLib.Person.FEMALE:
warn.write( _("Buried late: %(female_name)s died %(dyear)d, buried %(buryear)d.\n") % {
'female_name' : idstr, 'dyear' : dyear, 'buryear' : buryear } )
if dyear>0 and (byear>dyear):
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
error.write( _("Died before birth: %(male_name)s born %(byear)d, died %(dyear)d.\n") % {
'male_name' : idstr, 'byear' : byear, 'dyear' : dyear } )
if person.get_gender() == RelLib.Person.female:
if person.get_gender() == RelLib.Person.FEMALE:
error.write( _("Died before birth: %(female_name)s born %(byear)d, died %(dyear)d.\n") % {
'female_name' : idstr, 'byear' : byear, 'dyear' : dyear } )
if dyear>0 and (bapyear>dyear):
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
error.write( _("Died before baptism: %(male_name)s baptized %(bapyear)d, died %(dyear)d.\n") % {
'male_name' : idstr, 'bapyear' : bapyear, 'dyear' : dyear } )
if person.get_gender() == RelLib.Person.female:
if person.get_gender() == RelLib.Person.FEMALE:
error.write( _("Died before baptism: %(female_name)s baptized %(bapyear)d, died %(dyear)d.\n") % {
'female_name' : idstr, 'bapyear' : bapyear, 'dyear' : dyear } )
if buryear>0 and (byear>buryear):
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
error.write( _("Buried before birth: %(male_name)s born %(byear)d, buried %(buryear)d.\n") % {
'male_name' : idstr, 'byear' : byear, 'buryear' : buryear } )
if person.get_gender() == RelLib.Person.female:
if person.get_gender() == RelLib.Person.FEMALE:
error.write( _("Buried before birth: %(female_name)s born %(byear)d, buried %(buryear)d.\n") % {
'female_name' : idstr, 'byear' : byear, 'buryear' : buryear } )
if buryear>0 and (bapyear>buryear):
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
error.write( _("Buried before baptism: %(male_name)s baptized %(bapyear)d, buried %(buryear)d.\n") % {
'male_name' : idstr, 'bapyear' : bapyear, 'buryear' : buryear } )
if person.get_gender() == RelLib.Person.female:
if person.get_gender() == RelLib.Person.FEMALE:
error.write( _("Buried before baptism: %(female_name)s baptized %(bapyear)d, buried %(buryear)d.\n") % {
'female_name' : idstr, 'bapyear' : bapyear, 'buryear' : buryear } )
if byear == 0 and estimate_age:
@ -232,26 +232,26 @@ class Verify:
else:
ageatdeath = 0
if ageatdeath > oldage:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
warn.write( _("Old age: %(male_name)s born %(byear)d, died %(dyear)d, at the age of %(ageatdeath)d.\n") % {
'male_name' : idstr, 'byear' : byear, 'dyear' : dyear, 'ageatdeath' : ageatdeath } )
if person.get_gender() == RelLib.Person.female:
if person.get_gender() == RelLib.Person.FEMALE:
warn.write( _("Old age: %(female_name)s born %(byear)d, died %(dyear)d, at the age of %(ageatdeath)d.\n") % {
'female_name' : idstr, 'byear' : byear, 'dyear' : dyear, 'ageatdeath' : ageatdeath } )
# gender checks
if person.get_gender() == RelLib.Person.female:
if person.get_gender() == RelLib.Person.FEMALE:
oldpar = oldmom
yngpar = yngmom
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
oldpar = olddad
yngpar = yngdad
if (person.get_gender() != RelLib.Person.female) and (person.get_gender() != RelLib.Person.male):
if (person.get_gender() != RelLib.Person.FEMALE) and (person.get_gender() != RelLib.Person.MALE):
warn.write( _("Unknown gender for %s.\n") % idstr )
oldpar = olddad
yngpar = yngdad
if (person.get_gender() == RelLib.Person.female) and (person.get_gender() == RelLib.Person.male):
if (person.get_gender() == RelLib.Person.FEMALE) and (person.get_gender() == RelLib.Person.MALE):
error.write( _("Ambiguous gender for %s.\n") % idstr )
oldpar = olddad
yngpar = yngdad
@ -264,17 +264,17 @@ class Verify:
nkids = 0
nfam = len( person.get_family_handle_list() )
if nfam > wedder:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
warn.write( _("Married often: %(male_name)s married %(nfam)d times.\n") % {
'male_name' : idstr, 'nfam' : nfam } )
if person.get_gender() == RelLib.Person.female:
if person.get_gender() == RelLib.Person.FEMALE:
warn.write( _("Married often: %(female_name)s married %(nfam)d times.\n") % {
'female_name' : idstr, 'nfam' : nfam } )
if ageatdeath>oldunm and nfam == 0:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
warn.write( _("Old and unmarried: %(male_name)s died unmarried, at the age of %(ageatdeath)d years.\n") % {
'male_name' : idstr, 'ageatdeath' : ageatdeath } )
if person.get_gender() == RelLib.Person.female:
if person.get_gender() == RelLib.Person.FEMALE:
warn.write( _("Old and unmarried: %(female_name)s died unmarried, at the age of %(ageatdeath)d years.\n") % {
'female_name' : idstr, 'ageatdeath' : ageatdeath } )
prev_cbyear=0
@ -291,11 +291,11 @@ class Verify:
if father_handle:
father = self.db.get_person_from_handle(father_handle)
if mother_handle and father_handle:
if ( mother.get_gender() == father.get_gender() ) and mother.get_gender() != RelLib.Person.unknown:
if ( mother.get_gender() == father.get_gender() ) and mother.get_gender() != RelLib.Person.UNKNOWN:
warn.write( _("Homosexual marriage: %s in family %s.\n") % ( idstr, family.get_gramps_id() ) )
if father_handle == person.get_handle() and person.get_gender() == RelLib.Person.female:
if father_handle == person.get_handle() and person.get_gender() == RelLib.Person.FEMALE:
error.write( _("Female husband: %s in family %s.\n") % ( idstr, family.get_gramps_id() ) )
if mother_handle == person.get_handle() and person.get_gender() == RelLib.Person.male:
if mother_handle == person.get_handle() and person.get_gender() == RelLib.Person.MALE:
error.write( _("Male wife: %s in family %s.\n") % ( idstr, family.get_gramps_id() ) )
if father_handle == person.get_handle():
spouse_id = mother_handle
@ -303,7 +303,7 @@ class Verify:
spouse_id = father_handle
if spouse_id:
spouse = self.db.get_person_from_handle(spouse_id)
if person.get_gender() == RelLib.Person.male and \
if person.get_gender() == RelLib.Person.MALE and \
person.get_primary_name().get_surname() == spouse.get_primary_name().get_surname():
warn.write( _("Husband and wife with the same surname: %s in family %s, and %s.\n") % (
idstr,family.get_gramps_id(), spouse.get_primary_name().get_name() ) )
@ -341,39 +341,39 @@ class Verify:
if byear > 0:
marage = maryear - byear
if marage < 0:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
error.write( _("Married before birth: %(male_name)s born %(byear)d, married %(maryear)d to %(spouse)s.\n") % {
'male_name' : idstr, 'byear' : byear, 'maryear' : maryear, 'spouse' : spouse.get_primary_name().get_name() } )
if person.get_gender() == RelLib.Person.female:
if person.get_gender() == RelLib.Person.FEMALE:
error.write( _("Married before birth: %(female_name)s born %(byear)d, married %(maryear)d to %(spouse)s.\n") % {
'female_name' : idstr, 'byear' : byear, 'maryear' : maryear, 'spouse' : spouse.get_primary_name().get_name() } )
else:
if marage < yngmar:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
warn.write( _("Young marriage: %(male_name)s married at age %(marage)d to %(spouse)s.\n") % {
'male_name' : idstr, 'marage' : marage, 'spouse' : spouse.get_primary_name().get_name() } )
if person.get_gender() == RelLib.Person.female:
if person.get_gender() == RelLib.Person.FEMALE:
warn.write( _("Young marriage: %(female_name)s married at age %(marage)d to %(spouse)s.\n") % {
'female_name' : idstr, 'marage' : marage, 'spouse' : spouse.get_primary_name().get_name() } )
if marage > oldmar:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
warn.write( _("Old marriage: %(male_name)s married at age %(marage)d to %(spouse)s.\n") % {
'male_name' : idstr, 'marage' : marage, 'spouse' : spouse.get_primary_name().get_name() } )
if person.get_gender() == RelLib.Person.female:
if person.get_gender() == RelLib.Person.FEMALE:
warn.write( _("Old marriage: %(female_name)s married at age %(marage)d to %(spouse)s.\n") % {
'female_name' : idstr, 'marage' : marage, 'spouse' : spouse.get_primary_name().get_name() } )
if dyear>0 and maryear > dyear:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
error.write( _("Married after death: %(male_name)s died %(dyear)d, married %(maryear)d to %(spouse)s.\n") % {
'male_name' : idstr, 'dyear' : dyear, 'maryear' : maryear, 'spouse' : spouse.get_primary_name().get_name() } )
if person.get_gender() == RelLib.Person.female:
if person.get_gender() == RelLib.Person.FEMALE:
error.write( _("Married after death: %(female_name)s died %(dyear)d, married %(maryear)d to %(spouse)s.\n") % {
'female_name' : idstr, 'dyear' : dyear, 'maryear' : maryear, 'spouse' : spouse.get_primary_name().get_name() } )
if prev_cbyear > maryear:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
warn.write( _("Marriage before birth from previous family: %(male_name)s married %(maryear)d to %(spouse)s, previous birth %(prev_cbyear)d.\n") % {
'male_name' : idstr, 'maryear' : maryear, 'spouse' : spouse.get_primary_name().get_name(), 'prev_cbyear' : prev_cbyear } )
if person.get_gender() == RelLib.Person.female:
if person.get_gender() == RelLib.Person.FEMALE:
warn.write( _("Marriage before birth from previous family: %(female_name)s married %(maryear)d to %(spouse)s, previous birth %(prev_cbyear)d.\n") % {
'female_name' : idstr, 'maryear' : maryear, 'spouse' : spouse.get_primary_name().get_name(), 'prev_cbyear' : prev_cbyear } )
prev_maryear = maryear
@ -383,17 +383,17 @@ class Verify:
if maryear>0 and prev_sdyear > 0:
wdwyear = maryear-prev_sdyear
if wdwyear > lngwdw:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
warn.write( _("Long widowhood: %s was a widower %d years before, family %s.\n") % (idstr, wdwyear, family.get_gramps_id() ) )
if person.get_gender() == RelLib.Person.female:
if person.get_gender() == RelLib.Person.FEMALE:
warn.write( _("Long widowhood: %s was a widow %d years before, family %s.\n") % (idstr, wdwyear, family.get_gramps_id() ) )
if fnum==nfam and dyear>0 and sdyear>0:
wdwyear = dyear - sdyear
if wdwyear > lngwdw:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
warn.write( _("Long widowhood: %s was a widower %d years.\n") % (idstr, wdwyear) )
if person.get_gender() == RelLib.Person.female:
if person.get_gender() == RelLib.Person.FEMALE:
warn.write( _("Long widowhood: %s was a widow %d years.\n") % (idstr, wdwyear) )
nkids = 0
@ -409,40 +409,40 @@ class Verify:
if byear>0 and cbyear>0:
bage = cbyear - byear
if bage > oldpar:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
warn.write( _("Old father: %(male_name)s at age of %(bage)d in family %(fam)s had a child %(child)s.\n") % {
'male_name' : idstr, 'bage' : bage, 'fam' : family.get_handle(), 'child' : child.get_primary_name().get_name() } )
if person.get_gender() == RelLib.Person.female:
if person.get_gender() == RelLib.Person.FEMALE:
warn.write( _("Old mother: %(female_name)s at age of %(bage)d in family %(fam)s had a child %(child)s.\n") % {
'female_name' : idstr, 'bage' : bage, 'fam' : family.get_gramps_id(), 'child' : child.get_primary_name().get_name() } )
if bage < 0:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
error.write( _("Unborn father: %(male_name)s born %(byear)d, in family %(fam)s had a child %(child)s born %(cbyear)d.\n") % {
'male_name' : idstr, 'byear' : byear, 'fam' : family.get_gramps_id(), 'child' : child.get_primary_name().get_name(), 'cbyear' : cbyear } )
if person.get_gender() == RelLib.Person.female:
if person.get_gender() == RelLib.Person.FEMALE:
error.write( _("Unborn mother: %(female_name)s born %(byear)d, in family %(fam)s had a child %(child)s born %(cbyear)d.\n") % {
'female_name' : idstr, 'byear' : byear, 'fam' : family.get_gramps_id(), 'child' : child.get_primary_name().get_name(), 'cbyear' : cbyear } )
else:
if bage < yngpar:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
warn.write( _("Young father: %(male_name)s at the age of %(bage)d in family %(fam)s had a child %(child)s.\n") % {
'male_name' : idstr, 'bage' : bage, 'fam' : family.get_gramps_id(), 'child' : child.get_primary_name().get_name() } )
if person.get_gender() == RelLib.Person.female:
if person.get_gender() == RelLib.Person.FEMALE:
warn.write( _("Young mother: %(female_name)s at the age of %(bage)d in family %(fam)s had a child %(child)s.\n") % {
'female_name' : idstr, 'bage' : bage, 'fam' : family.get_gramps_id(), 'child' : child.get_primary_name().get_name() } )
if dyear>0 and cbyear>dyear:
if cbyear-1>dyear:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
error.write( _("Dead father: %(male_name)s died %(dyear)d, but in family %(fam)s had a child %(child)s born %(cbyear)d.\n") % {
'male_name' : idstr, 'dyear' : dyear, 'fam' : family.get_gramps_id(), 'child' : child.get_primary_name().get_name(), 'cbyear' : cbyear} )
if person.get_gender() == RelLib.Person.female:
if person.get_gender() == RelLib.Person.FEMALE:
error.write( _("Dead mother: %(female_name)s died %(dyear)d, but in family %(fam)s had a child %(child)s born %(cbyear)d.\n") % {
'female_name' : idstr, 'dyear' : dyear, 'fam' : family.get_gramps_id(), 'child' : child.get_primary_name().get_name(), 'cbyear' : cbyear} )
else:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
warn.write( _("Dead father: %(male_name)s died %(dyear)d, but in family %(fam)s had a child %(child)s born %(cbyear)d.\n") % {
'male_name' : idstr, 'dyear' : dyear, 'fam' : family.get_gramps_id(), 'child' : child.get_primary_name().get_name(), 'cbyear' : cbyear} )
if person.get_gender() == RelLib.Person.female:
if person.get_gender() == RelLib.Person.FEMALE:
warn.write( _("Dead mother: %(female_name)s died %(dyear)d, but in family %(fam)s had a child %(child)s born %(cbyear)d.\n") % {
'female_name' : idstr, 'dyear' : dyear, 'fam' : family.get_gramps_id(), 'child' : child.get_primary_name().get_name(), 'cbyear' : cbyear} )

4
gramps2/src/plugins/WebPage.py
View File

@ -323,9 +323,9 @@ class IndividualPage:
val = self.person.get_gramps_id()
self.write_id_row("%s:" % _("ID Number"),val)
if self.person.get_gender() == RelLib.Person.male:
if self.person.get_gender() == RelLib.Person.MALE:
self.write_normal_row("%s:" % _("Gender"), _("Male"),None)
elif self.person.get_gender() == RelLib.Person.female:
elif self.person.get_gender() == RelLib.Person.FEMALE:
self.write_normal_row("%s:" % _("Gender"), _("Female"),None)
else:
self.write_normal_row("%s:" % _("Gender"), _("Unknown"),None)

8
gramps2/src/plugins/WriteGeneWeb.py
View File

@ -265,9 +265,9 @@ class GeneWebWriter:
person = self.db.get_person_from_handle(witness.get_value())
if person:
gender = ""
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
gender = "h"
elif person.get_gender() == RelLib.Person.female:
elif person.get_gender() == RelLib.Person.FEMALE:
gender = "f"
self.writeln("wit %s %s %s" % (gender, self.get_ref_name(person), self.get_full_person_info_fam(person)))
@ -293,9 +293,9 @@ class GeneWebWriter:
child = self.db.get_person_from_handle(child_handle)
if child:
gender = ""
if child.get_gender() == RelLib.Person.male:
if child.get_gender() == RelLib.Person.MALE:
gender = "h"
elif child.get_gender() == RelLib.Person.female:
elif child.get_gender() == RelLib.Person.FEMALE:
gender = "f"
self.writeln("- %s %s %s" % (gender, self.get_child_ref_name(child, father_lastname), self.get_full_person_info_child(child)))
self.writeln("end")

8
gramps2/src/plugins/rel_da.py
View File

@ -99,7 +99,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
result.append('sønne')
else:
result.append('datter')
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
result.append('søn')
else:
result.append('datter')
@ -122,12 +122,12 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
result.append('sønne')
else:
result.append('datter')
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
result.append('søn')
else:
result.append('datter')
else:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
result.append('bror')
else:
result.append('søster')
@ -148,7 +148,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
return ('', [])
if self.is_spouse(orig_person,other_person):
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return ("ægtefælle",[])
else:
return ("hustru",[])

12
gramps2/src/plugins/rel_de.py
View File

@ -356,32 +356,32 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
if firstRel == 0:
if secondRel == 0:
return ('',common)
elif other_person.get_gender() == RelLib.Person.male:
elif other_person.get_gender() == RelLib.Person.MALE:
return (self.get_father(secondRel),common)
else:
return (self.get_mother(secondRel),common)
elif secondRel == 0:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_son(firstRel),common)
else:
return (self.get_daughter(firstRel),common)
elif firstRel == 1:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_uncle(secondRel),common)
else:
return (self.get_aunt(secondRel),common)
elif secondRel == 1:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_nephew(firstRel-1),common)
else:
return (self.get_niece(firstRel-1),common)
elif secondRel > firstRel:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_senior_male_cousin(secondRel-firstRel+1,secondRel-1),common)
else:
return (self.get_senior_female_cousin(secondRel-firstRel+1,secondRel-1),common)
else:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_junior_male_cousin(secondRel-1,firstRel-1),common)
else:
return (self.get_junior_female_cousin(secondRel-1,firstRel-1),common)

20
gramps2/src/plugins/rel_es.py
View File

@ -246,7 +246,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
return ('', [])
if self.is_spouse(orig_person,other_person):
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return ("marido",[])
else:
return ("mujer",[])
@ -266,47 +266,47 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
if firstRel == 0:
if secondRel == 0:
return ('',common)
elif other_person.get_gender() == RelLib.Person.male:
elif other_person.get_gender() == RelLib.Person.MALE:
return (self.get_father(secondRel),common)
else:
return (self.get_mother(secondRel),common)
elif secondRel == 0:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_son(firstRel),common)
else:
return (self.get_daughter(firstRel),common)
elif firstRel == 1:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_uncle(secondRel),common)
else:
return (self.get_aunt(secondRel),common)
elif secondRel == 1:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_nephew(firstRel-1),common)
else:
return (self.get_niece(firstRel-1),common)
elif firstRel == 2 and secondRel == 2:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return ('primo hermano',common)
else:
return ('prima hermana',common)
elif firstRel == secondRel:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_male_cousin(firstRel-1),common)
else:
return (self.get_female_cousin(firstRel-1),common)
elif firstRel == secondRel+1:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_distant_nephew(secondRel),common)
else:
return (self.get_distant_niece(secondRel),common)
elif firstRel+1 == secondRel:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_distant_uncle(firstRel),common)
else:
return (self.get_distant_aunt(firstRel),common)
else:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_male_relative(firstRel+secondRel),common)
else:
return (self.get_female_relative(firstRel+secondRel),common)

12
gramps2/src/plugins/rel_fi.py
View File

@ -87,7 +87,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
result.append('isän')
else:
result.append('äidin')
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
result.append('isä')
else:
result.append('äiti')
@ -102,9 +102,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
result.append('tyttären')
else:
result.append('lapsen')
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
result.append('poika')
elif person.get_gender() == RelLib.Person.female:
elif person.get_gender() == RelLib.Person.FEMALE:
result.append('tytär')
else:
result.append('lapsi')
@ -139,9 +139,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
result.append('tyttären')
else:
result.append('lapsen')
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
result.append('poika')
elif person.get_gender() == RelLib.Person.female:
elif person.get_gender() == RelLib.Person.FEMALE:
result.append('tytär')
else:
result.append('lapsi')
@ -202,7 +202,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
elif not secondRel:
return (self.get_direct_descendant(other_person,firstRel),common)
elif len(firstRel) == 1:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_ancestors_brother(secondRel),common)
else:
return (self.get_ancestors_sister(secondRel),common)

18
gramps2/src/plugins/rel_fr.py
View File

@ -147,7 +147,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
return ('', [])
if self.is_spouse(orig_person,other_person):
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return ("le mari",[])
else:
return ("la femme",[])
@ -167,42 +167,42 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
if firstRel == 0:
if secondRel == 0:
return ('',common)
elif other_person.get_gender() == RelLib.Person.male:
elif other_person.get_gender() == RelLib.Person.MALE:
return (self.get_father(secondRel),common)
else:
return (self.get_mother(secondRel),common)
elif secondRel == 0:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_son(firstRel),common)
else:
return (self.get_daughter(firstRel),common)
elif firstRel == 1:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_uncle(secondRel),common)
else:
return (self.get_aunt(secondRel),common)
elif secondRel == 1:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_nephew(firstRel-1),common)
else:
return (self.get_niece(firstRel-1),common)
elif firstRel == 2 and secondRel == 2:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return ('le cousin germain',common)
else:
return ('la cousine germaine',common)
elif firstRel == 3 and secondRel == 2:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return ('le neveu à la mode de Bretagne',common)
else:
return ('la nièce à la mode de Bretagne',common)
elif firstRel == 2 and secondRel == 3:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return ('l\'oncle à la mode de Bretagne',common)
else:
return ('la tante à la mode de Bretagne',common)
else:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
if firstRel+secondRel>len(_level_name)-1:
return (self.get_male_cousin(firstRel+secondRel),common)
else:

24
gramps2/src/plugins/rel_hu.py
View File

@ -269,7 +269,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
return ('', [])
if self.is_spouse(orig_person,other_person):
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
#FIXME: husband
return ("spouse",[])
else:
@ -277,25 +277,25 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
return ("spouse",[])
if self.is_fathermother_in_law(other_person,orig_person):
if other_person.getGender() == RelLib.Person.male:
if other_person.getGender() == RelLib.Person.MALE:
return ("apósa",self.get_fathermother_in_law_common(other_person,orig_person))
elif other_person.getGender() == RelLib.Person.female:
elif other_person.getGender() == RelLib.Person.FEMALE:
return ("anyósa",self.get_fathermother_in_law_common(other_person,orig_person))
elif other_person.getGender() == 2 :
return ("apósa vagy anyósa",self.get_fathermother_in_law_common(other_person,orig_person))
if self.is_fathermother_in_law(orig_person,other_person):
if orig_person.getGender() == RelLib.Person.male:
if orig_person.getGender() == RelLib.Person.MALE:
return ("veje",self.get_fathermother_in_law_common(orig_person,other_person))
elif orig_person.getGender() == RelLib.Person.female:
elif orig_person.getGender() == RelLib.Person.FEMALE:
return ("menye",self.get_fathermother_in_law_common(orig_person,other_person))
elif orig_person.getGender() == 2 :
return ("veje vagy menye",self.get_fathermother_in_law_common(orig_person,other_person))
if self.is_brothersister_in_law(orig_person,other_person):
if other_person.getGender() == RelLib.Person.male:
if other_person.getGender() == RelLib.Person.MALE:
return ("sógora",self.get_brothersister_in_law_common(orig_person,other_person))
elif other_person.getGender() == RelLib.Person.female:
elif other_person.getGender() == RelLib.Person.FEMALE:
return ("sógornője",self.get_brothersister_in_law_common(orig_person,other_person))
elif other_person.getGender() == 2 :
return ("sógora vagy sógornője",self.get_brothersister_in_law_common(orig_person,other_person))
@ -316,19 +316,19 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
if firstRel == 0:
if secondRel == 0:
return ('',common)
elif other_person.get_gender() == RelLib.Person.male:
elif other_person.get_gender() == RelLib.Person.MALE:
return (self.get_father(secondRel),common)
else:
return (self.get_mother(secondRel),common)
elif secondRel == 0:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_son(firstRel),common)
else:
return (self.get_daughter(firstRel),common)
elif firstRel == 1:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
if secondRel == 1:
return (self.get_age_brother(self.get_age_comp(orig_person,other_person)),common)
else :return (self.get_uncle(secondRel),common)
@ -338,13 +338,13 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
else :return (self.get_aunt(secondRel),common)
elif secondRel == 1:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_nephew(firstRel-1),common)
else:
return (self.get_niece(firstRel-1),common)
else:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_male_cousin(firstRel-1), common)
else:
return (self.get_female_cousin(firstRel-1), common)

10
gramps2/src/plugins/rel_it.py
View File

@ -169,27 +169,27 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
if firstRel == 0:
if secondRel == 0:
return ('',common)
elif other_person.get_gender() == RelLib.Person.male:
elif other_person.get_gender() == RelLib.Person.MALE:
return (self.get_father(secondRel),common)
else:
return (self.get_mother(secondRel),common)
elif secondRel == 0:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_son(firstRel),common)
else:
return (self.get_daughter(firstRel),common)
elif firstRel == 1:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_uncle(secondRel),common)
else:
return (self.get_aunt(secondRel),common)
elif secondRel == 1:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_nephew(firstRel-1),common)
else:
return (self.get_niece(firstRel-1),common)
else:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_male_cousin(firstRel-1, secondRel-1), common)
else:
return (self.get_female_cousin(firstRel-1, secondRel-1), common)

14
gramps2/src/plugins/rel_no.py
View File

@ -115,7 +115,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
result.append('sønne')
else:
result.append('datter')
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
result.append('sønn')
else:
result.append('datter')
@ -132,7 +132,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
result.append('mor')
if level > 1:
result.append(self.get_cousin(level))
elif person.get_gender() == RelLib.Person.male:
elif person.get_gender() == RelLib.Person.MALE:
result.append('fetter')
else:
result.append('kusine')
@ -161,7 +161,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
result.append('sønn')
else:
result.append('datter')
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
result.append('sønn')
else:
result.append('datter')
@ -207,12 +207,12 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
result.append('sønne')
else:
result.append('datter')
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
result.append('sønn')
else:
result.append('datter')
else:
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
result.append('bror')
else:
result.append('søster')
@ -237,7 +237,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
# FIXME: need Norwegian term for spouse. If gender-specific, use the code below.
# UPDATE by Frode: unsure about how it's included in the finished code, so I need
# to see this running to know if it is the right words to use.
# if other_person.get_gender() == RelLib.Person.male:
# if other_person.get_gender() == RelLib.Person.MALE:
# return ("ektemann",[])
# else:
# return ("hustru",[])
@ -259,7 +259,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
elif not secondRel:
return (self.get_direct_descendant(other_person,firstRel),common)
elif len(firstRel) == 1:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_ancestors_brother(secondRel),common)
else:
return (self.get_ancestors_sister(secondRel),common)

12
gramps2/src/plugins/rel_ru.py
View File

@ -225,32 +225,32 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
if firstRel == 0:
if secondRel == 0:
return ('',common)
elif other_person.get_gender() == RelLib.Person.male:
elif other_person.get_gender() == RelLib.Person.MALE:
return (self.get_father(secondRel),common)
else:
return (self.get_mother(secondRel),common)
elif secondRel == 0:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_son(firstRel),common)
else:
return (self.get_daughter(firstRel),common)
elif firstRel == 1:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_uncle(secondRel),common)
else:
return (self.get_aunt(secondRel),common)
elif secondRel == 1:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_nephew(firstRel-1),common)
else:
return (self.get_niece(firstRel-1),common)
elif secondRel > firstRel:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_senior_male_cousin(firstRel-1,secondRel-firstRel),common)
else:
return (self.get_senior_female_cousin(firstRel-1,secondRel-firstRel),common)
else:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_junior_male_cousin(secondRel-1,firstRel-secondRel),common)
else:
return (self.get_junior_female_cousin(secondRel-1,firstRel-secondRel),common)

8
gramps2/src/plugins/rel_sv.py
View File

@ -114,7 +114,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
result.append('son')
else:
result.append('dotter')
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
result.append('son')
else:
result.append('dotter')
@ -147,7 +147,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
result.append('son')
else:
result.append('dotter')
if person.get_gender() == RelLib.Person.male:
if person.get_gender() == RelLib.Person.MALE:
result.append('son')
else:
result.append('dotter')
@ -188,7 +188,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
return ('', [])
if self.is_spouse(orig_person,other_person):
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return ("make",[])
else:
return ("maka",[])
@ -210,7 +210,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
elif not secondRel:
return (self.get_direct_descendant(other_person,firstRel),common)
elif len(firstRel) == 1:
if other_person.get_gender() == RelLib.Person.male:
if other_person.get_gender() == RelLib.Person.MALE:
return (self.get_ancestors_brother(secondRel),common)
else:
return (self.get_ancestors_sister(secondRel),common)