forked from CGM_Public/pretix_original
Bump django-countries to 7.4.*
This commit is contained in:
@@ -23,8 +23,7 @@ import pyuca
|
|||||||
from babel.core import Locale
|
from babel.core import Locale
|
||||||
from django.core.cache import cache
|
from django.core.cache import cache
|
||||||
from django.utils import translation
|
from django.utils import translation
|
||||||
from django.utils.encoding import force_str
|
from django_countries import Countries
|
||||||
from django_countries import Countries, CountryTuple
|
|
||||||
from django_countries.fields import CountryField
|
from django_countries.fields import CountryField
|
||||||
from phonenumbers.data import _COUNTRY_CODE_TO_REGION_CODE
|
from phonenumbers.data import _COUNTRY_CODE_TO_REGION_CODE
|
||||||
|
|
||||||
@@ -61,22 +60,6 @@ class CachedCountries(Countries):
|
|||||||
cache.set(cache_key, val, 3600 * 24 * 30)
|
cache.set(cache_key, val, 3600 * 24 * 30)
|
||||||
yield from val
|
yield from val
|
||||||
|
|
||||||
def translate_pair(self, code: str, name=None):
|
|
||||||
# We need to temporarily override this function until
|
|
||||||
# https://github.com/SmileyChris/django-countries/issues/364
|
|
||||||
# is fixed
|
|
||||||
if name is None:
|
|
||||||
name = self.countries[code]
|
|
||||||
if isinstance(name, dict):
|
|
||||||
if "names" in name:
|
|
||||||
country_name: str = name["names"][0]
|
|
||||||
else:
|
|
||||||
country_name = name["name"]
|
|
||||||
else:
|
|
||||||
country_name = name
|
|
||||||
country_name = force_str(country_name)
|
|
||||||
return CountryTuple(code, country_name)
|
|
||||||
|
|
||||||
|
|
||||||
class FastCountryField(CountryField):
|
class FastCountryField(CountryField):
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
|
|||||||
@@ -171,7 +171,7 @@ setup(
|
|||||||
'Django==3.2.*',
|
'Django==3.2.*',
|
||||||
'django-bootstrap3==22.1.*',
|
'django-bootstrap3==22.1.*',
|
||||||
'django-compressor==4.1.*',
|
'django-compressor==4.1.*',
|
||||||
'django-countries==7.3.*',
|
'django-countries==7.4.*',
|
||||||
'django-filter==21.1',
|
'django-filter==21.1',
|
||||||
'django-formset-js-improved==0.5.0.2',
|
'django-formset-js-improved==0.5.0.2',
|
||||||
'django-formtools==2.3',
|
'django-formtools==2.3',
|
||||||
|
|||||||
Reference in New Issue
Block a user