ソースを参照

fix:ios language false zh-Hans is not cn (compatibility)

chenjunkai 6 年 前
コミット
2052d131e0
3 ファイル変更10 行追加3 行削除
  1. 1 0
      Controller/UserController.py
  2. 5 3
      Controller/UserManger.py
  3. 4 0
      Object/ResponseObject.py

+ 1 - 0
Controller/UserController.py

@@ -785,6 +785,7 @@ class v2registerView(TemplateView):
             return self.do_login(email_qs, response)
 
 
+# 重置密码
 # 忘记密码获取验证码v2
 class v2forgetPwdCodeView(TemplateView):
     @method_decorator(csrf_exempt)

+ 5 - 3
Controller/UserManger.py

@@ -194,19 +194,21 @@ class getAvatarView(TemplateView):
         if os.path.isfile(fullPath):
             try:
                 Imagedata = open(fullPath, 'rb').read()
-                return HttpResponse(Imagedata, content_type="image/jpeg")
             except Exception as e:
                 return response.json(906, repr(e))
+            else:
+                return HttpResponse(Imagedata, content_type="image/jpeg")
         else:
             print('----------------')
             print(defaultPath)
             print('----------------')
             try:
                 Imagedata = open(defaultPath, 'rb').read()
-                return HttpResponse(Imagedata, content_type="image/jpeg")
             except Exception as e:
                 return response.json(906, repr(e))
-            return response.json(907)
+            else:
+                return HttpResponse(Imagedata, content_type="image/jpeg")
+            # return response.json(907)
 
 
 @csrf_exempt

+ 4 - 0
Object/ResponseObject.py

@@ -109,6 +109,10 @@ class ResponseObject(object):
         }
         if self.lang == 'cn':
             msg = data_cn
+        elif self.lang == 'zh-Hans':
+            msg = data_cn
+        elif self.lang == 'zh-Hant':
+            msg = data_cn
         else:
             msg = data_en
         try: