fix(i18n): normalize underscore locale tags before fallback (#225)
All checks were successful
CI / test-and-quality (push) Successful in 3m55s
CI / test-and-quality (pull_request) Successful in 3m2s

This commit is contained in:
2026-03-01 23:29:49 +00:00
parent 000a486db1
commit 7a3d649e11
2 changed files with 18 additions and 1 deletions

View File

@@ -36,7 +36,13 @@ def lobby_i18n_error_messages() -> dict:
def resolve_locale(request: HttpRequest) -> str:
default_locale, supported_locales = i18n_locale_config()
requested = (get_language_from_request(request) or "").split("-", 1)[0].lower()
raw_accept_language = (request.META.get("HTTP_ACCEPT_LANGUAGE") or "").split(",", 1)[0]
raw_requested = raw_accept_language.split(";", 1)[0].strip().replace("_", "-").split("-", 1)[0].lower()
if raw_requested in supported_locales:
return raw_requested
requested = (get_language_from_request(request) or "").replace("_", "-").split("-", 1)[0].lower()
if requested in supported_locales:
return requested
return default_locale

View File

@@ -1263,6 +1263,17 @@ class I18nResolverTests(TestCase):
self.assertEqual(response.status_code, 400)
self.assertEqual(resolve_locale(response.wsgi_request), "da")
def test_resolve_locale_accepts_underscore_language_tags(self):
response = self.client.post(
reverse("lobby:join_session"),
data={"code": "", "nickname": "Luna"},
content_type="application/json",
HTTP_ACCEPT_LANGUAGE="da_DK",
)
self.assertEqual(response.status_code, 400)
self.assertEqual(resolve_locale(response.wsgi_request), "da")
def test_resolve_locale_defaults_to_en_when_header_missing(self):
response = self.client.post(
reverse("lobby:join_session"),