Projet

Général

Profil

0002-settings-rename-erroneous-lang-phone-number-entry-fo.patch

Paul Marillonnet, 31 janvier 2023 09:40

Télécharger (5,43 ko)

Voir les différences: 

Subject: [PATCH 2/2] settings: rename erroneous 'lang' phone number entry for
 'region' (#73998)


 src/authentic2/attribute_kinds.py      |  4 ++--
 src/authentic2/custom_user/managers.py |  2 +-
 src/authentic2/forms/fields.py         |  4 ++--
 src/authentic2/forms/widgets.py        |  2 +-
 src/authentic2/settings.py             | 14 +++++++-------
 src/authentic2/utils/misc.py           |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)
src/authentic2/attribute_kinds.py
148 148 

  		




  149
  149
  
    

  		




  150
  150
  
    
def validate_phone_number(value):

  		




  151
  
  
    
    default_country = settings.PHONE_COUNTRY_CODES[settings.DEFAULT_COUNTRY_CODE]['lang']

  		




  
  151
  
    
    default_country = settings.PHONE_COUNTRY_CODES[settings.DEFAULT_COUNTRY_CODE]['region']

  		




  152
  152
  
    
    try:

  		




  153
  153
  
    
        phonenumbers.parse(value)

  		




  154
  154
  
    
    except phonenumbers.NumberParseException:

  		




  ......




  199
  199
  
    
        if isinstance(data, (list, tuple)):

  		




  200
  200
  
    
            data = data[0]

  		




  201
  201
  
    
        data = super().to_internal_value(clean_number(data))

  		




  202
  
  
    
        default_country = settings.PHONE_COUNTRY_CODES[settings.DEFAULT_COUNTRY_CODE]['lang']

  		




  
  202
  
    
        default_country = settings.PHONE_COUNTRY_CODES[settings.DEFAULT_COUNTRY_CODE]['region']

  		




  203
  203
  
    
        try:

  		




  204
  204
  
    
            pn = phonenumbers.parse(data)

  		




  205
  205
  
    
        except phonenumbers.NumberParseException:

  		












  

    
      src/authentic2/custom_user/managers.py
    
  





  70
  70
  
    
        else:

  		




  71
  71
  
    
            return wrap_qs(self.filter(uuid=guid.hex))

  		




  72
  72
  
    

  		




  73
  
  
    
        default_country = settings.PHONE_COUNTRY_CODES[settings.DEFAULT_COUNTRY_CODE]['lang']

  		




  
  73
  
    
        default_country = settings.PHONE_COUNTRY_CODES[settings.DEFAULT_COUNTRY_CODE]['region']

  		




  74
  74
  
    
        phone_number = None

  		




  75
  75
  
    
        formatted_phone_number = None

  		




  76
  76
  
    
        try:

  		












  

    
      src/authentic2/forms/fields.py
    
  





  237
  237
  
    
            data_list[0] = '+%s' % data_list[0]

  		




  238
  238
  
    
            data_list[1] = clean_number(data_list[1])

  		




  239
  239
  
    
            dial = (

  		




  240
  
  
    
                settings.PHONE_COUNTRY_CODES.get(country_code, {}).get('lang', None)

  		




  241
  
  
    
                or settings.PHONE_COUNTRY_CODES[settings.DEFAULT_COUNTRY_CODE]['lang']

  		




  
  240
  
    
                settings.PHONE_COUNTRY_CODES.get(country_code, {}).get('region', None)

  		




  
  241
  
    
                or settings.PHONE_COUNTRY_CODES[settings.DEFAULT_COUNTRY_CODE]['region']

  		




  242
  242
  
    
            )

  		




  243
  243
  
    
            try:

  		




  244
  244
  
    
                pn = phonenumbers.parse(''.join(data_list), dial)

  		












  

    
      src/authentic2/forms/widgets.py
    
  





  395
  395
  
    
class PhoneWidget(MultiWidget):

  		




  396
  396
  
    
    def __init__(self, attrs=None):

  		




  397
  397
  
    
        prefixes = (

  		




  398
  
  
    
            (code, '{area} (+{code})'.format(area=value['area'], code=code))

  		




  
  398
  
    
            (code, '{region_desc} (+{code})'.format(region_desc=value['region_desc'], code=code))

  		




  399
  399
  
    
            for code, value in settings.PHONE_COUNTRY_CODES.items()

  		




  400
  400
  
    
        )

  		




  401
  401
  
    
        widgets = [

  		












  

    
      src/authentic2/settings.py
    
  





  397
  397
  
    

  		




  398
  398
  
    
# Phone prefixes by country for phone number as authentication identifier

  		




  399
  399
  
    
PHONE_COUNTRY_CODES = {

  		




  400
  
  
    
    '32': {'lang': 'BE', 'area': _('Belgium')},

  		




  401
  
  
    
    '33': {'lang': 'FR', 'area': _('Metropolitan France')},

  		




  402
  
  
    
    '262': {'lang': 'RE', 'area': _('Réunion')},

  		




  403
  
  
    
    '508': {'lang': 'PM', 'area': _('Saint Pierre and Miquelon')},

  		




  404
  
  
    
    '590': {'lang': 'GP', 'area': _('Guadeloupe')},

  		




  405
  
  
    
    '594': {'lang': 'GF', 'area': _('French Guiana')},

  		




  406
  
  
    
    '596': {'lang': 'MQ', 'area': _('Martinique')},

  		




  
  400
  
    
    '32': {'region': 'BE', 'region_desc': _('Belgium')},

  		




  
  401
  
    
    '33': {'region': 'FR', 'region_desc': _('Metropolitan France')},

  		




  
  402
  
    
    '262': {'region': 'RE', 'region_desc': _('Réunion')},

  		




  
  403
  
    
    '508': {'region': 'PM', 'region_desc': _('Saint Pierre and Miquelon')},

  		




  
  404
  
    
    '590': {'region': 'GP', 'region_desc': _('Guadeloupe')},

  		




  
  405
  
    
    '594': {'region': 'GF', 'region_desc': _('French Guiana')},

  		




  
  406
  
    
    '596': {'region': 'MQ', 'region_desc': _('Martinique')},

  		




  407
  407
  
    
}

  		




  408
  408
  
    

  		




  409
  409
  
    
DEFAULT_COUNTRY_CODE = '33'

  		












  

    
      src/authentic2/utils/misc.py
    
  





  1359
  1359
  
    
        try:

  		




  1360
  1360
  
    
            parsed_pn = phonenumbers.parse(

  		




  1361
  1361
  
    
                phonenumber,

  		




  1362
  
  
    
                settings.PHONE_COUNTRY_CODES[settings.DEFAULT_COUNTRY_CODE]['lang'],

  		




  
  1362
  
    
                settings.PHONE_COUNTRY_CODES[settings.DEFAULT_COUNTRY_CODE]['region'],

  		




  1363
  1363
  
    
            )

  		




  1364
  1364
  
    
        except phonenumbers.NumberParseException:

  		




  1365
  1365
  
    
            pass

  		




  1366
  
  
    
-