From bf30f9933be84ead885ad55d54c9928e058740b0 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Wed, 24 Apr 2002 12:59:15 +0000 Subject: [PATCH] Spec file update, GEDCOM note work around for FTM bug svn: r942 --- gramps.spec | 2 +- src/RelLib.py | 4 ++++ src/gramps.py | 2 +- src/intl.py | 3 +++ src/plugins/ReadGedcom.py | 4 ++-- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gramps.spec b/gramps.spec index af7e225ba..b02fb5aa3 100644 --- a/gramps.spec +++ b/gramps.spec @@ -15,7 +15,7 @@ URL: http://gramps.sourceforge.net Requires: python >= 1.5.2 Requires: pygnome >= 1.0.53 -Requires: pygnome-libglade +Requires: _gladegnomemodule.so Requires: pyexpat.so %description diff --git a/src/RelLib.py b/src/RelLib.py index 37086f6df..ceccc01cd 100644 --- a/src/RelLib.py +++ b/src/RelLib.py @@ -462,6 +462,10 @@ class Note: """return the note contents""" return self.text + def append(self,text): + """adds the text to the note's contents""" + return self.text + text + class Photo(SourceNote): """Containter for information about an image file, including location, description and privacy""" diff --git a/src/gramps.py b/src/gramps.py index b04ad59db..145cbd9ca 100755 --- a/src/gramps.py +++ b/src/gramps.py @@ -13,7 +13,7 @@ if os.environ.has_key("GRAMPSI18N"): loc = os.environ["GRAMPSI18N"] else: loc = "locale" - + intl.textdomain("gramps") intl.bindtextdomain("gramps",loc) locale.setlocale(locale.LC_NUMERIC,"C") diff --git a/src/intl.py b/src/intl.py index 2902b235a..63c262d4b 100644 --- a/src/intl.py +++ b/src/intl.py @@ -47,6 +47,9 @@ try: def bindtextdomain(s,x): return except: + import traceback + traceback.print_exc() + def gettext(s): return s diff --git a/src/plugins/ReadGedcom.py b/src/plugins/ReadGedcom.py index 2bfd0a236..3bf9334b3 100644 --- a/src/plugins/ReadGedcom.py +++ b/src/plugins/ReadGedcom.py @@ -397,9 +397,9 @@ class GedcomParser: self.nmap[matches[1]] = noteobj text = matches[2][4:] if text == "": - noteobj.set(self.parse_note_continue(1)) + noteobj.append(self.parse_note_continue(1)) else: - noteobj.set(text + self.parse_note_continue(1)) + noteobj.append(text + self.parse_note_continue(1)) self.parse_note_data(1) elif matches[2] == "OBJE": self.ignore_sub_junk(1)