[names] replace name affixes with both country/language and language-only variants
This commit is contained in:
@@ -82,8 +82,10 @@ class NameAffixes(object):
|
|||||||
re = None
|
re = None
|
||||||
if country is not None:
|
if country is not None:
|
||||||
re = d.get((country, lang))
|
re = d.get((country, lang))
|
||||||
if re is None:
|
if re:
|
||||||
re = d.get(lang)
|
name = re.sub(six.u(''), name)
|
||||||
|
|
||||||
|
re = d.get(lang)
|
||||||
|
|
||||||
if not re:
|
if not re:
|
||||||
return name
|
return name
|
||||||
@@ -101,8 +103,10 @@ class NameAffixes(object):
|
|||||||
re = None
|
re = None
|
||||||
if country is not None:
|
if country is not None:
|
||||||
re = d.get((country, lang))
|
re = d.get((country, lang))
|
||||||
if re is None:
|
if re:
|
||||||
re = d.get(lang)
|
name = re.sub(six.u(''), name)
|
||||||
|
|
||||||
|
re = d.get(lang)
|
||||||
|
|
||||||
if not re:
|
if not re:
|
||||||
return name
|
return name
|
||||||
|
|||||||
Reference in New Issue
Block a user