[names] replace name affixes with both country/language and language-only variants

2016-12-20 03:10:13 -05:00
parent 9e44fcb2bb
commit cd25ca1537
1 changed files with 8 additions and 4 deletions
--- a/scripts/geodata/names/normalization.py
+++ b/scripts/geodata/names/normalization.py
@@ -82,7 +82,9 @@ class NameAffixes(object):
        re = None
        if country is not None:
            re = d.get((country, lang))
-        if re is None:
+            if re:
+                name = re.sub(six.u(''), name)
+
        re = d.get(lang)

        if not re:
@@ -101,7 +103,9 @@ class NameAffixes(object):
        re = None
        if country is not None:
            re = d.get((country, lang))
-        if re is None:
+            if re:
+                name = re.sub(six.u(''), name)
+
        re = d.get(lang)

        if not re: