From 098f0950cbe8626a5572ce22237ee38421de3209 Mon Sep 17 00:00:00 2001
From: wangruidong <940853815@qq.com>
Date: Tue, 14 Oct 2025 15:30:32 +0800
Subject: [PATCH] fix: Incorrect language display in email content

---
 apps/authentication/api/connection_token.py | 2 +-
 apps/users/utils.py                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/authentication/api/connection_token.py b/apps/authentication/api/connection_token.py
index 97723cb14..4359257e8 100644
--- a/apps/authentication/api/connection_token.py
+++ b/apps/authentication/api/connection_token.py
@@ -375,7 +375,7 @@ class ConnectionTokenViewSet(AuthFaceMixin, ExtraActionApiMixin, RootOrgViewMixi
         for name in default_name_opts.keys():
             value = preferences.get(name, default_name_opts[name])
             connect_options[name] = value
-        connect_options['lang'] = getattr(user, 'lang', settings.LANGUAGE_CODE)
+        connect_options['lang'] = getattr(user, 'lang') or settings.LANGUAGE_CODE
         data['connect_options'] = connect_options
 
     @staticmethod
diff --git a/apps/users/utils.py b/apps/users/utils.py
index 9a9836fdc..5b7d95257 100644
--- a/apps/users/utils.py
+++ b/apps/users/utils.py
@@ -320,6 +320,6 @@ def is_auth_confirm_time_valid(session):
 
 @contextmanager
 def activate_user_language(user):
-    language = getattr(user, 'lang', settings.LANGUAGE_CODE)
+    language = getattr(user, 'lang') or settings.LANGUAGE_CODE
     with translation.override(language):
         yield