Merge branch 'master' of https://github.com/2DU/opennamu

language/en-US.json

@@ -364,5 +364,6 @@
             "decument_404_error" : "This document does not exist.",
             "fast_edit_error" : "You can edit another document after this period (Second(s)) : ",
             "too_many_dec_error" : "This feature is not supported because there are too many documents.",
-            "application_not_found" : "Application not found"
+            "application_not_found" : "Application not found",
+            "invalid_password_error" : "The Password is invalid."
 }

language/ko-KR.json

@@ -340,5 +340,6 @@
     "add_admin_group" : "관리자 그룹 추가",
     "add_watchlist" : "주시 문서 추가",
     "blocked_user" : "차단된 사용자",
-    "blocked_admin" : "차단한 관리자"
+    "blocked_admin" : "차단한 관리자",
+    "invalid_password_error" : "비밀번호가 없습니다."
 }

route/login_register.py

@@ -23,7 +23,7 @@ def login_register_2(conn):
             captcha_post('', 0)
 
         if flask.request.form.get('id', None) == '' or flask.request.form.get('pw', None) == '':
-            return redirect('/register')
+            return re_error('/error/27')
 
         if flask.request.form.get('pw', None) != flask.request.form.get('pw2', None):
             return re_error('/error/20')
@@ -168,4 +168,4 @@ def login_register_2(conn):
                 </form>
             ''',
             menu = [['user', load_lang('return')]]
-        ))
+        ))

route/tool/func.py

@@ -1169,6 +1169,8 @@ def re_error(data):
                 data = load_lang('too_many_dec_error')
             elif num == 26:
                 data = load_lang('application_not_found')
+            elif num == 27:
+                data = load_lang("invalid_password_error")
             else:
                 data = '???'