From e6dd79f2413cb87afcef9f04a6f0f35e4bae655c Mon Sep 17 00:00:00 2001 From: Aman Agrawal Date: Fri, 21 Mar 2025 18:05:24 +0530 Subject: [PATCH] registration: Fix language code missing for `find_team` emails. If there were no users found for `find_team`, we need to provide a default langauge for the email as one cannot be extracted from `UserProfile` in this case. --- zerver/lib/i18n.py | 7 +++++++ zerver/views/registration.py | 2 ++ 2 files changed, 9 insertions(+) diff --git a/zerver/lib/i18n.py b/zerver/lib/i18n.py index abdb44d73c..ca9cbdd245 100644 --- a/zerver/lib/i18n.py +++ b/zerver/lib/i18n.py @@ -96,3 +96,10 @@ def get_default_language_for_new_user(realm: Realm, *, request: HttpRequest | No if browser_language_code is not None: return browser_language_code return realm.default_language + + +def get_default_language_for_anonymous_user(request: HttpRequest) -> str: + browser_language_code = get_browser_language_code(request) + if browser_language_code is not None: + return browser_language_code + return settings.LANGUAGE_CODE diff --git a/zerver/views/registration.py b/zerver/views/registration.py index f01d0f5be1..e7bae3d6d3 100644 --- a/zerver/views/registration.py +++ b/zerver/views/registration.py @@ -57,6 +57,7 @@ from zerver.lib.email_validation import email_allowed_for_realm, validate_email_ from zerver.lib.exceptions import RateLimitedError from zerver.lib.i18n import ( get_browser_language_code, + get_default_language_for_anonymous_user, get_default_language_for_new_user, get_language_name, ) @@ -1241,6 +1242,7 @@ def find_account(request: HttpRequest) -> HttpResponse: ), from_address=FromAddress.SUPPORT, request=request, + language=get_default_language_for_anonymous_user(request), ) return render( request,