github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: Incorrect language display in email content

pull/16141/head
wangruidong 2025-10-14 15:30:32 +08:00 committed by 老广
parent 39b0830a6b
commit 098f0950cb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/authentication/api/connection_token.py
View File

@ -375,7 +375,7 @@ class ConnectionTokenViewSet(AuthFaceMixin, ExtraActionApiMixin, RootOrgViewMixi
for name in default_name_opts.keys(): for name in default_name_opts.keys():
value = preferences.get(name, default_name_opts[name]) value = preferences.get(name, default_name_opts[name])
connect_options[name] = value 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 data['connect_options'] = connect_options
@staticmethod @staticmethod

2
apps/users/utils.py
View File

@ -320,6 +320,6 @@ def is_auth_confirm_time_valid(session):
@contextmanager @contextmanager
def activate_user_language(user): def activate_user_language(user):
language = getattr(user, 'lang', settings.LANGUAGE_CODE) language = getattr(user, 'lang') or settings.LANGUAGE_CODE
with translation.override(language): with translation.override(language):
yield yield