entrouvert
/
authentic
16
0
Fork 0
Code Issues Pull Requests 33 Releases Activity

settings: rename erroneous 'lang' phone number entry for 'region' (#73998)

This commit is contained in:
Paul Marillonnet 2023-01-31 09:25:43 +01:00
parent 1abaaa207b
commit 1a24a85fb9
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/authentic2/attribute_kinds.py
View File

@ -148,7 +148,7 @@ def get_title_choices():
def validate_phone_number(value):
default_country = settings.PHONE_COUNTRY_CODES[settings.DEFAULT_COUNTRY_CODE]['lang']
default_country = settings.PHONE_COUNTRY_CODES[settings.DEFAULT_COUNTRY_CODE]['region']
try:
phonenumbers.parse(value)
except phonenumbers.NumberParseException:
@ -199,7 +199,7 @@ class PhoneNumberDRFField(serializers.CharField):
if isinstance(data, (list, tuple)):
data = data[0]
data = super().to_internal_value(clean_number(data))
default_country = settings.PHONE_COUNTRY_CODES[settings.DEFAULT_COUNTRY_CODE]['lang']
default_country = settings.PHONE_COUNTRY_CODES[settings.DEFAULT_COUNTRY_CODE]['region']
try:
pn = phonenumbers.parse(data)
except phonenumbers.NumberParseException:

2
src/authentic2/custom_user/managers.py
View File

@ -70,7 +70,7 @@ class UserQuerySet(models.QuerySet):
else:
return wrap_qs(self.filter(uuid=guid.hex))
default_country = settings.PHONE_COUNTRY_CODES[settings.DEFAULT_COUNTRY_CODE]['lang']
default_country = settings.PHONE_COUNTRY_CODES[settings.DEFAULT_COUNTRY_CODE]['region']
phone_number = None
formatted_phone_number = None
try:

4
src/authentic2/forms/fields.py
View File

@ -237,8 +237,8 @@ class PhoneField(MultiValueField):
data_list[0] = '+%s' % data_list[0]
data_list[1] = clean_number(data_list[1])
dial = (
settings.PHONE_COUNTRY_CODES.get(country_code, {}).get('lang', None)
or settings.PHONE_COUNTRY_CODES[settings.DEFAULT_COUNTRY_CODE]['lang']
settings.PHONE_COUNTRY_CODES.get(country_code, {}).get('region', None)
or settings.PHONE_COUNTRY_CODES[settings.DEFAULT_COUNTRY_CODE]['region']
)
try:
pn = phonenumbers.parse(''.join(data_list), dial)

2
src/authentic2/forms/widgets.py
View File

@ -395,7 +395,7 @@ class SelectAttributeWidget(forms.Select):
class PhoneWidget(MultiWidget):
def __init__(self, attrs=None):
prefixes = (
(code, '{area} (+{code})'.format(area=value['area'], code=code))
(code, '{region_desc} (+{code})'.format(region_desc=value['region_desc'], code=code))
for code, value in settings.PHONE_COUNTRY_CODES.items()
)
widgets = [

14
src/authentic2/settings.py
View File

@ -397,13 +397,13 @@ SELECT2_CSS = '/static/xstatic/select2.min.css'
# Phone prefixes by country for phone number as authentication identifier
PHONE_COUNTRY_CODES = {
'32': {'lang': 'BE', 'area': _('Belgium')},
'33': {'lang': 'FR', 'area': _('Metropolitan France')},
'262': {'lang': 'RE', 'area': _('Réunion')},
'508': {'lang': 'PM', 'area': _('Saint Pierre and Miquelon')},
'590': {'lang': 'GP', 'area': _('Guadeloupe')},
'594': {'lang': 'GF', 'area': _('French Guiana')},
'596': {'lang': 'MQ', 'area': _('Martinique')},
'32': {'region': 'BE', 'region_desc': _('Belgium')},
'33': {'region': 'FR', 'region_desc': _('Metropolitan France')},
'262': {'region': 'RE', 'region_desc': _('Réunion')},
'508': {'region': 'PM', 'region_desc': _('Saint Pierre and Miquelon')},
'590': {'region': 'GP', 'region_desc': _('Guadeloupe')},
'594': {'region': 'GF', 'region_desc': _('French Guiana')},
'596': {'region': 'MQ', 'region_desc': _('Martinique')},
}
DEFAULT_COUNTRY_CODE = '33'

2
src/authentic2/utils/misc.py
View File

@ -1359,7 +1359,7 @@ def parse_phone_number(phonenumber):
try:
parsed_pn = phonenumbers.parse(
phonenumber,
settings.PHONE_COUNTRY_CODES[settings.DEFAULT_COUNTRY_CODE]['lang'],
settings.PHONE_COUNTRY_CODES[settings.DEFAULT_COUNTRY_CODE]['region'],
)
except phonenumbers.NumberParseException:
pass