setup: be more tolerant towards unknown languages, follow pycountry c…

…hanges
chrysn · Jan 21, 2019 · dfde50b · dfde50b
1 parent da0ebac
commit dfde50b
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/setup.py b/setup.py
@@ -151,7 +151,10 @@ def language2name(lang):
                 lang, country = lang.split('_')
             else:
                 country = None
-            lang = pycountry.languages.get(alpha2=lang).name
+            try:
+                lang = pycountry.languages.get(alpha_2=lang).name
+            except KeyError:
+                pass # eg. "ckb"
 
             try:
                 # strip suffixes like 'Catalan; Valencian'
@@ -165,7 +168,10 @@ def language2name(lang):
                 pass
 
             if country:
-                country = pycountry.countries.get(alpha2=country).name
+                try:
+                    country = pycountry.countries.get(alpha_2=country).name
+                except KeyError:
+                    pass # keep country, eg. zh-Hant, whatever that means in detail
                 return u"%s (%s)"%(lang, country)
             else:
                 return lang