From cb359e8d47fc409128a1722ca21a684e9bd8385b Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Mon, 11 Aug 2003 00:59:16 +0000 Subject: [PATCH] * configure.in: Set version to 0.9.4 (since the release is 0.CVS...). Otherwise it becomes older-version that the latest release. * src/EditPerson.py: Change const.save_fevent() calls to const.save_event(). * src/EventEdit.py: Display event name with const.display_event() (was backwards). * src/GrampsParser.py: Call const.save_event() and const.attr() when parsing XML. This should take care of prior data with standard events and attributes recorded in $LANG. * src/FamilyView.py (nameof): Translate parent's relation to a child. svn: r1986 --- gramps2/ChangeLog | 12 ++++++++++++ gramps2/src/EditPerson.py | 8 ++++---- gramps2/src/EventEdit.py | 2 +- gramps2/src/FamilyView.py | 2 +- gramps2/src/GrampsParser.py | 11 ++++++----- 5 files changed, 24 insertions(+), 11 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 8acc97d87..62af16af8 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,15 @@ +2003-08-10 Alex Roitman + * configure.in: Set version to 0.9.4 (since the release is 0.CVS...). + Otherwise it becomes older-version that the latest release. + * src/EditPerson.py: Change const.save_fevent() calls to + const.save_event(). + * src/EventEdit.py: Display event name with const.display_event() + (was backwards). + * src/GrampsParser.py: Call const.save_event() and const.attr() + when parsing XML. This should take care of prior data with standard + events and attributes recorded in $LANG. + * src/FamilyView.py (nameof): Translate parent's relation to a child. + 2003-08-11 Alexandre Duret-Lutz * configure.in: Modernize calls to AC_INIT, AM_INIT_AUTOMAKE and AC_OUTPUT. Require Autoconf >= 2.57 and Automake >= 1.6.3. diff --git a/gramps2/src/EditPerson.py b/gramps2/src/EditPerson.py index 1e79f5bb6..1441f0584 100644 --- a/gramps2/src/EditPerson.py +++ b/gramps2/src/EditPerson.py @@ -798,7 +798,7 @@ class EditPerson: import EventEdit pname = self.person.getPrimaryName().getName() EventEdit.EventEditor(self,pname,const.personalEvents, - const.save_fevent,None,None,0,self.event_edit_callback) + const.save_event,None,None,0,self.event_edit_callback) def on_edit_birth_clicked(self,obj): """Brings up the EventEditor for the birth record, event @@ -817,7 +817,7 @@ class EditPerson: if p: event.setPlace(p) EventEdit.EventEditor(self,pname,const.personalEvents, - const.save_fevent,event,def_placename,1, + const.save_event,event,def_placename,1, self.event_edit_callback) def on_edit_death_clicked(self,obj): @@ -837,7 +837,7 @@ class EditPerson: if p: event.setPlace(p) EventEdit.EventEditor(self,pname,const.personalEvents, - const.save_fevent,event,def_placename,1, + const.save_event,event,def_placename,1, self.event_edit_callback) def on_aka_delete_clicked(self,obj): @@ -1084,7 +1084,7 @@ class EditPerson: pname = self.person.getPrimaryName().getName() event = self.etree.get_object(iter) EventEdit.EventEditor(self,pname,const.personalEvents, - const.save_fevent,event,None,0, + const.save_event,event,None,0, self.event_edit_callback) def on_event_select_row(self,obj): diff --git a/gramps2/src/EventEdit.py b/gramps2/src/EventEdit.py index de215bede..d141fc5cb 100644 --- a/gramps2/src/EventEdit.py +++ b/gramps2/src/EventEdit.py @@ -130,7 +130,7 @@ class EventEditor: AutoComp.AutoEntry(self.place_field,self.pmap.keys()) if event != None: - self.name_field.set_text(self.trans(event.getName())) + self.name_field.set_text(const.display_event(event.getName())) if (def_placename): self.place_field.set_text(def_placename) else: diff --git a/gramps2/src/FamilyView.py b/gramps2/src/FamilyView.py index 08c7bdbd0..b19333314 100644 --- a/gramps2/src/FamilyView.py +++ b/gramps2/src/FamilyView.py @@ -566,7 +566,7 @@ class FamilyView: def nameof(self,l,p,mode): if p: n = GrampsCfg.nameof(p) - return _("%s: %s\n\tRelationship: %s") % (l,n,mode) + return _("%s: %s\n\tRelationship: %s") % (l,n,_(mode)) else: return _("%s: unknown") % (l) diff --git a/gramps2/src/GrampsParser.py b/gramps2/src/GrampsParser.py index 8dc55231c..8e39945f6 100644 --- a/gramps2/src/GrampsParser.py +++ b/gramps2/src/GrampsParser.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000 Donald N. Allingham +# Copyright (C) 2000-2003 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,6 +18,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +import const import RelLib import Date @@ -279,7 +280,7 @@ class GrampsParser: def start_event(self,attrs): self.event = RelLib.Event() - self.event_type = attrs["type"] + self.event_type = const.save_event(attrs["type"]) if attrs.has_key("conf"): self.event.conf = int(attrs["conf"]) else: @@ -296,7 +297,7 @@ class GrampsParser: if attrs.has_key("priv"): self.attribute.private = int(attrs["priv"]) if attrs.has_key('type'): - self.attribute.setType(attrs["type"]) + self.attribute.setType(const.save_attr(attrs["type"])) if attrs.has_key('value'): self.attribute.setValue(attrs["value"]) if self.photo: @@ -371,7 +372,7 @@ class GrampsParser: self.count = self.count + 1 self.family = self.db.findFamilyNoMap(attrs["id"]) if attrs.has_key("type"): - self.family.setRelationship(attrs["type"]) + self.family.setRelationship(const.save_frel(attrs["type"])) else: self.family.setRelationship("") @@ -923,7 +924,7 @@ class GrampsImportParser(GrampsParser): self.count = self.count + 1 self.family = self.db.findFamilyNoConflicts(attrs["id"],self.fmap) if attrs.has_key("type"): - self.family.setRelationship(attrs["type"]) + self.family.setRelationship(const.save_frel(attrs["type"])) def start_sourceref(self,attrs): self.source_ref = RelLib.SourceRef()