[languages] Adding script-only disambiguation

This commit is contained in:
Al
2016-05-23 11:17:59 -04:00
parent e6157915af
commit bd341417a3
2 changed files with 42 additions and 6 deletions

View File

@@ -240,10 +240,20 @@ class AddressComponents(object):
language = candidate_languages[0]['lang']
else:
street = components.get(AddressFormatter.ROAD, None)
lang_tuples = [(l['lang'], l['default']) for l in candidate_languages]
if street is not None:
language = disambiguate_language(street, [(l['lang'], l['default']) for l in candidate_languages])
language = disambiguate_language(street, lang_tuples)
else:
language = UNKNOWN_LANGUAGE
if has_non_latin_script(lang_tuples):
for component, value in six.iteritems(components):
language = disambiguate_language_script(value, lang_tuples)
if language is not UNKNOWN_LANGUAGE:
break
else:
language = UNKNOWN_LANGUAGE
else:
language = UNKNOWN_LANGUAGE
return language