From 3e34012e69dd25fa3267188da7910b5793e92d4e Mon Sep 17 00:00:00 2001 From: Al Date: Sat, 6 Aug 2016 20:36:56 -0400 Subject: [PATCH] [fix] if the language is given already, use it as a suffix rather than choosing at random --- scripts/geodata/addresses/components.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/geodata/addresses/components.py b/scripts/geodata/addresses/components.py index 7753caad..8aa69274 100644 --- a/scripts/geodata/addresses/components.py +++ b/scripts/geodata/addresses/components.py @@ -1210,10 +1210,15 @@ class AddressComponents(object): more_than_one_official_language = len(candidate_languages) > 1 + non_local_language = None + language_suffix = '' + if not language: language = self.address_language(address_components, candidate_languages) - - non_local_language = self.non_local_language() + non_local_language = self.non_local_language() + language_suffix = self.pick_language_suffix(all_osm_components, language, non_local_language, more_than_one_official_language) + else: + language_suffix = ':{}'.format(language) address_state = self.state_name(address_components, country, language, non_local_language=non_local_language) if address_state: @@ -1225,7 +1230,6 @@ class AddressComponents(object): all_languages = set([l['lang'] for l in candidate_languages]) all_osm_components = osm_components + neighborhoods - language_suffix = self.pick_language_suffix(all_osm_components, language, non_local_language, more_than_one_official_language) self.normalize_place_names(address_components, all_osm_components, country=country, languages=all_languages)