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

9737: Fix house number concatenation

Browse Source
This commit is contained in:
Nick Hall 2016-12-09 18:57:06 +00:00
parent cde4c4ebf5
commit 176fcae6ad
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gramps/gen/display/place.py
View File

@ -65,13 +65,18 @@ class PlaceDisplay:
else: else:
places = places[index:] places = places[index:]
names = [item[0] for item in places]
if config.get('preferences.place-number'): if config.get('preferences.place-number'):
if len(places) > 1 and int(places[0][1]) == PlaceType.NUMBER: types = [item[1] for item in places]
names = names[1:] try:
names[0] = places[0][0] + ' ' + names[0] idx = types.index(PlaceType.NUMBER)
except ValueError:
idx = None
if idx is not None and len(places) > idx+1:
combined = (places[idx][0] + ' ' + places[idx+1][0],
places[idx+1][1])
places = places[:idx] + [combined] + places[idx+2:]
names = [item[0] for item in places]
if config.get('preferences.place-reverse'): if config.get('preferences.place-reverse'):
names.reverse() names.reverse()