paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-25 09:03:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

i18n: Tweak args/kwargs for get_default_language_for_new_user.

Browse Source 
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.
This commit is contained in:
Mateusz Mandera
2023-10-01 20:24:43 +02:00
committed by Tim Abbott
parent a802f0f339
commit 092ecbacc6
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/lib/i18n.py
View File

@@ -85,7 +85,7 @@ def get_browser_language_code(request: HttpRequest) -> Optional[str]:
return None 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) browser_language_code = get_browser_language_code(request)
if browser_language_code is not None: if browser_language_code is not None:
return browser_language_code return browser_language_code

6
zerver/tests/test_signup.py
View File

@@ -3953,17 +3953,17 @@ class UserSignUpTest(ZulipTestCase):
realm = get_realm("zulip") realm = get_realm("zulip")
req = HostRequestMock() req = HostRequestMock()
req.META["HTTP_ACCEPT_LANGUAGE"] = "de,en" 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) do_set_realm_property(realm, "default_language", "hi", acting_user=None)
realm.refresh_from_db() realm.refresh_from_db()
req = HostRequestMock() req = HostRequestMock()
req.META["HTTP_ACCEPT_LANGUAGE"] = "de,en" 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 = HostRequestMock()
req.META["HTTP_ACCEPT_LANGUAGE"] = "" 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): class DeactivateUserTest(ZulipTestCase):

4
zerver/views/registration.py
View File

@@ -548,7 +548,7 @@ def registration_helper(
do_change_user_setting( do_change_user_setting(
user_profile, user_profile,
"default_language", "default_language",
get_default_language_for_new_user(request, realm), get_default_language_for_new_user(realm, request=request),
acting_user=None, acting_user=None,
) )
# TODO: When we clean up the `do_activate_mirror_dummy_user` code path, # TODO: When we clean up the `do_activate_mirror_dummy_user` code path,
@@ -565,7 +565,7 @@ def registration_helper(
role=role, role=role,
tos_version=settings.TERMS_OF_SERVICE_VERSION, tos_version=settings.TERMS_OF_SERVICE_VERSION,
timezone=timezone, 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, default_stream_groups=default_stream_groups,
source_profile=source_profile, source_profile=source_profile,
realm_creation=realm_creation, realm_creation=realm_creation,