From 105fe534cd30678270531e6272225391b2b53a98 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Fri, 12 May 2023 18:14:21 +0200
Subject: [PATCH] Use PHONENUMBER_DEFAULT_REGION from Core
---
CHANGELOG.rst | 1 +
aleksis/apps/csv_import/tests/util/test_converters.py | 6 +++---
aleksis/apps/csv_import/util/converters.py | 5 ++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e5f1266..fab2bfa 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -13,6 +13,7 @@ Changed
~~~~~~~
* Ukrainian translations were updated.
+* Phonenumber country is now configured using the `PHONENUMBER_DEFAULT_REGION` setting.
`3.0b0`_ - 2023-02-22
---------------------
diff --git a/aleksis/apps/csv_import/tests/util/test_converters.py b/aleksis/apps/csv_import/tests/util/test_converters.py
index 0b84330..1eb330f 100644
--- a/aleksis/apps/csv_import/tests/util/test_converters.py
+++ b/aleksis/apps/csv_import/tests/util/test_converters.py
@@ -14,14 +14,14 @@ from aleksis.core.util.core_helpers import get_site_preferences
pytestmark = pytest.mark.django_db
-def test_parse_phone_number():
- get_site_preferences()["internationalisation__phone_number_country"] = "DE"
+def test_parse_phone_number(settings):
+ settings.PHONENUMBER_DEFAULT_REGION = "DE"
fake_number = PhoneNumber(country_code=49, national_number=1635550217)
assert parse_phone_number("+49-163-555-0217") == fake_number
assert parse_phone_number("+491635550217") == fake_number
assert parse_phone_number("0163-555-0217") == 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("01635550217") != fake_number
diff --git a/aleksis/apps/csv_import/util/converters.py b/aleksis/apps/csv_import/util/converters.py
index 3e949a9..32dc8a0 100644
--- a/aleksis/apps/csv_import/util/converters.py
+++ b/aleksis/apps/csv_import/util/converters.py
@@ -6,6 +6,7 @@ from phonenumber_field.phonenumber import PhoneNumber
from phonenumbers import NumberParseException
from aleksis.apps.csv_import.settings import SEXES
+from aleksis.core import settings
from aleksis.core.util.core_helpers import get_site_preferences
@@ -35,9 +36,7 @@ converter_registry = ConverterRegistry()
def parse_phone_number(value: str) -> Union[PhoneNumber, str]:
"""Parse a phone number."""
try:
- number = PhoneNumber.from_string(
- value, get_site_preferences()["internationalisation__phone_number_country"]
- )
+ number = PhoneNumber.from_string(value, settings.PHONENUMBER_DEFAULT_REGION)
if number.is_valid():
return number
except NumberParseException:
--
GitLab