disable bk_language while the i18n is not support in ce (#155)

TencentBlueKing · Aug 30, 2019 · e99f98f · e99f98f
1 parent 2a9127f
commit e99f98f
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/paas-ce/paas/login/bkaccount/accounts.py b/paas-ce/paas/login/bkaccount/accounts.py
@@ -328,13 +328,14 @@ def login_success_response(self, request, user_or_form, redirect_to, app_id):
                             expires=expire_time,
                             domain=settings.BK_COOKIE_DOMAIN,
                             httponly=True)
+        # NOTE: DO NOT SET THE LANGUAGE COOKIE HERE BEFORE I18N is AVAILABLE
         # set cookie for app or platform
-        bk_user_info, is_created = UserInfo.objects.get_or_create(user=user)
-        response.set_cookie(settings.LANGUAGE_COOKIE_NAME, bk_user_info.language,
-                            # max_age=settings.LANGUAGE_COOKIE_AGE,
-                            expires=expire_time,
-                            path=settings.LANGUAGE_COOKIE_PATH,
-                            domain=settings.LANGUAGE_COOKIE_DOMAIN)
+        # bk_user_info, is_created = UserInfo.objects.get_or_create(user=user)
+        # response.set_cookie(settings.LANGUAGE_COOKIE_NAME, bk_user_info.language,
+        #                     # max_age=settings.LANGUAGE_COOKIE_AGE,
+        #                     expires=expire_time,
+        #                     path=settings.LANGUAGE_COOKIE_PATH,
+        #                     domain=settings.LANGUAGE_COOKIE_DOMAIN)
         return response
 
     def login_redirect_response(self, request, redirect_url, is_from_logout):