eng version in progress

api/main.py

@@ -100,13 +100,13 @@ async def get_home_page(request: Request, response: Response):
 async def get_home_page(request: Request, response: Response):
     return templates.TemplateResponse("index.html", {"request": request, "response": response})
 
-@app.get("/make_video", response_class=HTMLResponse)
+@app.get("/make_video")
 async def get_home_page(request: Request, response: Response, Authorize: AuthJWT = Depends()):
     try:
         Authorize.jwt_required()
     except Exception as e:
         print(e)
-        return '請先登入帳號'
+        return {'msg':{'eng':'Please login first','zh':'請先登入帳號'}}
     current_user = Authorize.get_jwt_subject()
     return templates.TemplateResponse("make_video.html", {"request": request, "response": response})
 
@@ -116,7 +116,7 @@ async def get_home_page(request: Request, response: Response, Authorize: AuthJWT
         Authorize.jwt_required()
     except Exception as e:
         print(e)
-        return '請先登入帳號'
+        return {'msg':{'eng':'Please login first','zh':'請先登入帳號'}}
     current_user = Authorize.get_jwt_subject()
     return templates.TemplateResponse("make_video_long.html", {"request": request, "response": response})
 
@@ -126,7 +126,7 @@ async def make_video_slide(request: Request, response: Response, Authorize: Auth
         Authorize.jwt_required()
     except Exception as e:
         print(e)
-        return '請先登入帳號'
+        return {'msg':{'eng':'Please login first','zh':'請先登入帳號'}}
     current_user = Authorize.get_jwt_subject()
     return templates.TemplateResponse("make_video_slide.html", {"request": request, "response": response})
 
@@ -227,13 +227,13 @@ async def register_old(request: Request):
             code = str(time.time()).replace('.','')
             db['register_veri_code'].insert({'code':code,'user_id':id})
             mailer.register_verify('請至點擊網址驗證 : https://www.choozmo.com:8887/verify_email?code='+code, user.email)
-            return '註冊成功! 請回到上頁登入帳號'
+            return {'msg':{'eng':'Register success! Please login at previous page','zh':'註冊成功! 請回到上頁登入帳號'}}
         else :
             return {'msg':'error'}
         #return templates.TemplateResponse("make_video.html", {"request": request, "success": True},status_code=status.HTTP_302_FOUND)
         #return templates.TemplateResponse("login.html", {'request': request,"success": True}, status_code=status.HTTP_302_FOUND)
     else:
-        return {'msg':user.username+'重複，請更改'}
+        return 'msg':{'eng':user.username+' is duplicated user name try another','zh':user.username+'重複，請更改'}}
 
 @app.post("/register")
 async def register(request: models.register_req):
@@ -246,11 +246,11 @@ async def register(request: models.register_req):
             code = str(time.time()).replace('.','')
             db['register_veri_code'].insert({'code':code,'user_id':id})
             mailer.register_verify('請至點擊網址驗證 : https://www.choozmo.com:8887/verify_email?code='+code, request.email)
-            return '註冊成功! 請回到上頁登入帳號'
+            return {'msg':{'eng':'Register success! Please login at previous page','zh':'註冊成功! 請回到上頁登入帳號'}}
         else :
             return {'msg':'error'}
     else:
-        return {'msg':request.username+':使用者名稱重複，請更改'}
+        return 'msg':{'eng':user.username+' is duplicated user name try another','zh':user.username+'重複，請更改'}}
 
 
 @app.get('/logout')