tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[formatting] Moving language country overrides to formatter config so actual language is retained

Browse Source
This commit is contained in:
Al
2016-05-24 16:52:08 -04:00
parent e59e3a173c
commit 308080f6ee
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/geodata/address_formatting/formatter.py
View File

@@ -180,6 +180,8 @@ class AddressFormatter(object):
self.load_config()
self.load_country_formats()
self.language_code_replacements = nested_get(self.config, ('global', 'languages', 'language_code_replacements'))
self.setup_insertion_probabilities()
self.setup_no_name_templates()
self.setup_place_only_templates()
@@ -681,6 +683,7 @@ class AddressFormatter(object):
def get_template_from_config(self, config, country, language=None):
template = None
if language:
language = self.language_code_replacements.get(language, language)
# For countries like China and Japan where the country format varies
# based on which language is being used
template = config.get('{}_{}'.format(country.upper(), language.lower()), None)