Skip to content
Snippets Groups Projects
Verified Commit 105fe534 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Use PHONENUMBER_DEFAULT_REGION from Core

parent be9d4911
No related branches found
No related tags found
1 merge request!121Prepare release 3.0
Pipeline #126552 passed with warnings
...@@ -13,6 +13,7 @@ Changed ...@@ -13,6 +13,7 @@ Changed
~~~~~~~ ~~~~~~~
* Ukrainian translations were updated. * Ukrainian translations were updated.
* Phonenumber country is now configured using the `PHONENUMBER_DEFAULT_REGION` setting.
`3.0b0`_ - 2023-02-22 `3.0b0`_ - 2023-02-22
--------------------- ---------------------
......
...@@ -14,14 +14,14 @@ from aleksis.core.util.core_helpers import get_site_preferences ...@@ -14,14 +14,14 @@ from aleksis.core.util.core_helpers import get_site_preferences
pytestmark = pytest.mark.django_db pytestmark = pytest.mark.django_db
def test_parse_phone_number(): def test_parse_phone_number(settings):
get_site_preferences()["internationalisation__phone_number_country"] = "DE" settings.PHONENUMBER_DEFAULT_REGION = "DE"
fake_number = PhoneNumber(country_code=49, national_number=1635550217) fake_number = PhoneNumber(country_code=49, national_number=1635550217)
assert parse_phone_number("+49-163-555-0217") == fake_number assert parse_phone_number("+49-163-555-0217") == fake_number
assert parse_phone_number("+491635550217") == fake_number assert parse_phone_number("+491635550217") == fake_number
assert parse_phone_number("0163-555-0217") == fake_number assert parse_phone_number("0163-555-0217") == fake_number
assert parse_phone_number("01635550217") == fake_number assert parse_phone_number("01635550217") == fake_number
get_site_preferences()["internationalisation__phone_number_country"] = "GB" settings.PHONENUMBER_DEFAULT_REGION = "GB"
assert parse_phone_number("0163-555-0217") != fake_number assert parse_phone_number("0163-555-0217") != fake_number
assert parse_phone_number("01635550217") != fake_number assert parse_phone_number("01635550217") != fake_number
......
...@@ -6,6 +6,7 @@ from phonenumber_field.phonenumber import PhoneNumber ...@@ -6,6 +6,7 @@ from phonenumber_field.phonenumber import PhoneNumber
from phonenumbers import NumberParseException from phonenumbers import NumberParseException
from aleksis.apps.csv_import.settings import SEXES from aleksis.apps.csv_import.settings import SEXES
from aleksis.core import settings
from aleksis.core.util.core_helpers import get_site_preferences from aleksis.core.util.core_helpers import get_site_preferences
...@@ -35,9 +36,7 @@ converter_registry = ConverterRegistry() ...@@ -35,9 +36,7 @@ converter_registry = ConverterRegistry()
def parse_phone_number(value: str) -> Union[PhoneNumber, str]: def parse_phone_number(value: str) -> Union[PhoneNumber, str]:
"""Parse a phone number.""" """Parse a phone number."""
try: try:
number = PhoneNumber.from_string( number = PhoneNumber.from_string(value, settings.PHONENUMBER_DEFAULT_REGION)
value, get_site_preferences()["internationalisation__phone_number_country"]
)
if number.is_valid(): if number.is_valid():
return number return number
except NumberParseException: except NumberParseException:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment