From 50f2226da65d391be2badac512970cabbb7ed1ec Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sat, 24 Sep 2005 02:24:26 +0000 Subject: [PATCH] * src/WriteGedcom.py: handle patronymics svn: r5222 --- gramps2/ChangeLog | 3 +++ gramps2/doc/gramps-manual/C/preface.xml | 13 +++++++------ gramps2/src/WriteGedcom.py | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 373097f4e..f46009bf1 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,6 @@ +2005-09-24 Don Allingham + * src/WriteGedcom.py: handle patronymics + 2005-09-24 Martin Hawlisch * src/GrampsDbBase.py: Properly validate ID prefix strings diff --git a/gramps2/doc/gramps-manual/C/preface.xml b/gramps2/doc/gramps-manual/C/preface.xml index a4debfb2d..6c3bb4767 100644 --- a/gramps2/doc/gramps-manual/C/preface.xml +++ b/gramps2/doc/gramps-manual/C/preface.xml @@ -25,13 +25,14 @@ Preface - &app; is a software package designed to help you with + &app; is a free software package designed to help you with genealogical research. It allows you to store, edit, and research - genealogical data using your computer. Although similar to other - genealogical programs, it offers some unique and powerful - features. GRAMPS is an open source software package, which means - it's distributed for free. It's developed and maintained by a - worldwide team of volunteers. + genealogical data using your computer. &app; is an open source + software package, which means you are free to run it on any number + of computers, examine the code, make changes, and redistribute as + many copies as you like. It is developed and maintained by a + worldwide team of volunteers and is available at no cost from the + project web site and from many software distributions diff --git a/gramps2/src/WriteGedcom.py b/gramps2/src/WriteGedcom.py index 6562bbdf6..3017529e6 100644 --- a/gramps2/src/WriteGedcom.py +++ b/gramps2/src/WriteGedcom.py @@ -1157,7 +1157,7 @@ class GedcomWriter: self.writeln("%s %s" % (prefix,self.cnvtxt(date.get_text()))) def write_person_name(self,name,nick): - firstName = self.cnvtxt(name.get_first_name()) + firstName = self.cnvtxt("%s %s" % (name.get_first_name(),name.get_patronymic())).strip() surName = self.cnvtxt(name.get_surname()) surName = surName.replace('/','?') surPref = self.cnvtxt(name.get_surname_prefix()) @@ -1175,7 +1175,7 @@ class GedcomWriter: else: self.writeln("1 NAME %s/%s %s/%s" % (firstName,surPref,surName,suffix)) - if name.get_first_name(): + if firstName: self.writeln("2 GIVN %s" % firstName) if self.prefix: if surPref: