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

9472: Use first matching name when generating place titles

Browse Source
This commit is contained in:
Nick Hall 2016-05-30 22:22:39 +01:00
parent 14dc963f3d
commit 0801ef1b30
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gramps/gen/utils/location.py
View File

@ -53,16 +53,14 @@ def get_location_list(db, place, date=None, lang=''):
return lines return lines
def __get_name(place, date, lang): def __get_name(place, date, lang):
local_name = '?' names = {}
for place_name in place.get_all_names(): for place_name in place.get_all_names():
name_date = place_name.get_date_object() name_date = place_name.get_date_object()
if name_date.is_empty() or date.match_exact(name_date): if name_date.is_empty() or date.match_exact(name_date):
name_lang = place_name.get_language() name_lang = place_name.get_language()
if name_lang == '': if name_lang not in names:
local_name = place_name.get_value() names[name_lang] = place_name.get_value()
if place_name.get_language() == lang: return names.get(lang, names.get('', '?'))
return place_name.get_value()
return local_name
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #