From 54d9d45486c273eb1a023cd52fb2a7c9cfd2c17c Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Mon, 30 May 2016 22:22:39 +0100 Subject: [PATCH] 9472: Use first matching name when generating place titles --- gramps/gen/utils/location.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gramps/gen/utils/location.py b/gramps/gen/utils/location.py index 181406274..ba9d7836c 100644 --- a/gramps/gen/utils/location.py +++ b/gramps/gen/utils/location.py @@ -53,16 +53,14 @@ def get_location_list(db, place, date=None, lang=''): return lines def __get_name(place, date, lang): - local_name = '?' + names = {} for place_name in place.get_all_names(): name_date = place_name.get_date_object() if name_date.is_empty() or date.match_exact(name_date): name_lang = place_name.get_language() - if name_lang == '': - local_name = place_name.get_value() - if place_name.get_language() == lang: - return place_name.get_value() - return local_name + if name_lang not in names: + names[name_lang] = place_name.get_value() + return names.get(lang, names.get('', '?')) #------------------------------------------------------------------------- #