[fix] don't add phrases for non-numeric existing components
This commit is contained in:
@@ -487,14 +487,14 @@ class AddressComponents(object):
|
|||||||
|
|
||||||
def get_component_phrase(self, cls, component, language, country=None):
|
def get_component_phrase(self, cls, component, language, country=None):
|
||||||
component = safe_decode(component)
|
component = safe_decode(component)
|
||||||
if is_numeric(component):
|
if not is_numeric(component):
|
||||||
phrase = cls.phrase(component, language, country=country)
|
return None
|
||||||
if phrase != component:
|
|
||||||
return phrase
|
phrase = cls.phrase(component, language, country=country)
|
||||||
else:
|
if phrase != component:
|
||||||
return None
|
return phrase
|
||||||
else:
|
else:
|
||||||
return component
|
return None
|
||||||
|
|
||||||
def cldr_country_name(self, country_code, language):
|
def cldr_country_name(self, country_code, language):
|
||||||
'''
|
'''
|
||||||
@@ -856,6 +856,8 @@ class AddressComponents(object):
|
|||||||
phrase = self.get_component_phrase(component_class, num, language, country=country)
|
phrase = self.get_component_phrase(component_class, num, language, country=country)
|
||||||
if phrase and phrase != existing:
|
if phrase and phrase != existing:
|
||||||
address_components[component] = phrase
|
address_components[component] = phrase
|
||||||
|
elif not phrase:
|
||||||
|
address_components.pop(component)
|
||||||
|
|
||||||
def add_sub_building_components(self, address_components, language, country=None, num_floors=None, num_basements=None, zone=None):
|
def add_sub_building_components(self, address_components, language, country=None, num_floors=None, num_basements=None, zone=None):
|
||||||
generated_components = set()
|
generated_components = set()
|
||||||
|
|||||||
Reference in New Issue
Block a user