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

2007-05-31 Don Allingham <don@gramps-project.org>

Browse Source 
* configure.in: update to 2.2.9
	* src/plugins/WriteFtree.py (get_name): fix typo



svn: r8521
This commit is contained in:
Don Allingham 2007-05-31 12:09:11 +00:00
parent 3e4ec3c651
commit 7adf9e0dc9
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps2/ChangeLog
View File

@ -1,3 +1,7 @@
2007-05-31 Don Allingham <don@gramps-project.org>
* configure.in: update to 2.2.9
* src/plugins/WriteFtree.py (get_name): fix typo
2007-05-27 Don Allingham <don@gramps-project.org> 2007-05-27 Don Allingham <don@gramps-project.org>
* configure.in: update for 2.2.8 * configure.in: update for 2.2.8

6
gramps2/configure.in
View File

@ -4,15 +4,15 @@ dnl Process this file with autoconf to produce a configure script.
dnl May need to run automake && aclocal first dnl May need to run automake && aclocal first
AC_PREREQ(2.57) AC_PREREQ(2.57)
AC_INIT(gramps, 2.2.8, [gramps-bugs@lists.sourceforge.net]) AC_INIT(gramps, 2.2.9, [gramps-bugs@lists.sourceforge.net])
AC_CONFIG_SRCDIR(configure.in) AC_CONFIG_SRCDIR(configure.in)
AM_INIT_AUTOMAKE(1.6.3) AM_INIT_AUTOMAKE(1.6.3)
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
GNOME_DOC_INIT GNOME_DOC_INIT
dnl RELEASE=0.SVN$(svnversion -n .) RELEASE=0.SVN$(svnversion -n .)
RELEASE=1 dnl RELEASE=1
VERSIONSTRING=$VERSION VERSIONSTRING=$VERSION
if test x"$RELEASE" != "x" if test x"$RELEASE" != "x"

13
gramps2/src/GrampsDb/_ReadGedcom.py
View File

@ -1969,11 +1969,14 @@ class GedcomParser(UpdateCallback):
if place_handle: if place_handle:
place = self.db.get_place_from_handle(place_handle) place = self.db.get_place_from_handle(place_handle)
main_loc = place.get_main_location() main_loc = place.get_main_location()
if main_loc and main_loc.get_street() != location.get_street(): try:
old_title = place.get_title() if main_loc and main_loc.get_street() != location.get_street():
place = self.find_or_create_place(index) old_title = place.get_title()
place.set_title(old_title) place = self.find_or_create_place(index)
place_handle = place.handle place.set_title(old_title)
place_handle = place.handle
except:
print matches
else: else:
place = self.find_or_create_place(index) place = self.find_or_create_place(index)
place.set_title(matches[2]) place.set_title(matches[2])

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

@ -299,7 +299,7 @@ def get_name(name,count):
return "%s %s%s" % (name.first_name, name.surname, val) return "%s %s%s" % (name.first_name, name.surname, val)
else: else:
if name.prefix: if name.prefix:
return "%s %s %s%s, %s" % (name.first_name, name.prefix, name.surname, val, name.Suffix) return "%s %s %s%s, %s" % (name.first_name, name.prefix, name.surname, val, name.suffix)
else: else:
return "%s %s%s, %s" % (name.first_name, name.surname, val, name.suffix) return "%s %s%s, %s" % (name.first_name, name.surname, val, name.suffix)