From 092ecbacc64e07198bf4e717f9a06f8b9c51aa90 Mon Sep 17 00:00:00 2001 From: Mateusz Mandera Date: Sun, 1 Oct 2023 20:24:43 +0200 Subject: [PATCH] i18n: Tweak args/kwargs for get_default_language_for_new_user. Making request a mandatory kwarg avoids confusion about the meaning of parameters, especially with `request` acquiring the ability to be None in the upcoming next commit. --- zerver/lib/i18n.py | 2 +- zerver/tests/test_signup.py | 6 +++--- zerver/views/registration.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/zerver/lib/i18n.py b/zerver/lib/i18n.py index 7aeba76dba..add39c2327 100644 --- a/zerver/lib/i18n.py +++ b/zerver/lib/i18n.py @@ -85,7 +85,7 @@ def get_browser_language_code(request: HttpRequest) -> Optional[str]: return None -def get_default_language_for_new_user(request: HttpRequest, realm: Realm) -> str: +def get_default_language_for_new_user(realm: Realm, *, request: HttpRequest) -> str: browser_language_code = get_browser_language_code(request) if browser_language_code is not None: return browser_language_code diff --git a/zerver/tests/test_signup.py b/zerver/tests/test_signup.py index 3c09e15adc..8577655731 100644 --- a/zerver/tests/test_signup.py +++ b/zerver/tests/test_signup.py @@ -3953,17 +3953,17 @@ class UserSignUpTest(ZulipTestCase): realm = get_realm("zulip") req = HostRequestMock() req.META["HTTP_ACCEPT_LANGUAGE"] = "de,en" - self.assertEqual(get_default_language_for_new_user(req, realm), "de") + self.assertEqual(get_default_language_for_new_user(realm, request=req), "de") do_set_realm_property(realm, "default_language", "hi", acting_user=None) realm.refresh_from_db() req = HostRequestMock() req.META["HTTP_ACCEPT_LANGUAGE"] = "de,en" - self.assertEqual(get_default_language_for_new_user(req, realm), "de") + self.assertEqual(get_default_language_for_new_user(realm, request=req), "de") req = HostRequestMock() req.META["HTTP_ACCEPT_LANGUAGE"] = "" - self.assertEqual(get_default_language_for_new_user(req, realm), "hi") + self.assertEqual(get_default_language_for_new_user(realm, request=req), "hi") class DeactivateUserTest(ZulipTestCase): diff --git a/zerver/views/registration.py b/zerver/views/registration.py index 3bffdcbeba..544a888c54 100644 --- a/zerver/views/registration.py +++ b/zerver/views/registration.py @@ -548,7 +548,7 @@ def registration_helper( do_change_user_setting( user_profile, "default_language", - get_default_language_for_new_user(request, realm), + get_default_language_for_new_user(realm, request=request), acting_user=None, ) # TODO: When we clean up the `do_activate_mirror_dummy_user` code path, @@ -565,7 +565,7 @@ def registration_helper( role=role, tos_version=settings.TERMS_OF_SERVICE_VERSION, timezone=timezone, - default_language=get_default_language_for_new_user(request, realm), + default_language=get_default_language_for_new_user(realm, request=request), default_stream_groups=default_stream_groups, source_profile=source_profile, realm_creation=realm_creation,