Просмотр исходного кода

다시 언어 몇몇 값 추가

Surplus_Up (2DU) 7 лет назад
Родитель
Сommit
6980cb0ab5
4 измененных файлов с 17 добавлено и 15 удалено
  1. 14 14
      app.py
  2. 1 0
      language/en-US.json
  3. 1 0
      language/ko-KR.json
  4. 1 1
      views/main_css/main.css

+ 14 - 14
app.py

@@ -2613,9 +2613,9 @@ def login():
             imp = [load_lang('login'), wiki_set(), custom(), other2([0, 0])],
             imp = [load_lang('login'), wiki_set(), custom(), other2([0, 0])],
             data =  '''
             data =  '''
                     <form method="post">
                     <form method="post">
-                        <input placeholder="id" name="id" type="text">
+                        <input placeholder="''' + load_lang('id') + '''" name="id" type="text">
                         <hr>
                         <hr>
-                        <input placeholder="password" name="pw" type="password">
+                        <input placeholder="''' + load_lang('password') + '''" name="pw" type="password">
                         <hr>
                         <hr>
                         ''' + captcha_get() + '''
                         ''' + captcha_get() + '''
                         <button type="submit">''' + load_lang('login') + '''</button>
                         <button type="submit">''' + load_lang('login') + '''</button>
@@ -2700,13 +2700,13 @@ def change_password():
                         <form method="post">
                         <form method="post">
                             <span>id : ''' + ip + '''</span>
                             <span>id : ''' + ip + '''</span>
                             <hr>
                             <hr>
-                            <input placeholder="''' + load_lang('now') + ''' password" name="pw4" type="password">
+                            <input placeholder="''' + load_lang('now') + ' ' + load_lang('password') + '''" name="pw4" type="password">
                             <br>
                             <br>
                             <br>
                             <br>
-                            <input placeholder="''' + load_lang('new') + ''' password" name="pw2" type="password">
+                            <input placeholder="''' + load_lang('new') + ' ' + load_lang('password') + '''" name="pw2" type="password">
                             <br>
                             <br>
                             <br>
                             <br>
-                            <input placeholder="password ''' + load_lang('confirm') + '''" name="pw3" type="password">
+                            <input placeholder="''' + load_lang('password') + ' ' + load_lang('confirm') + '''" name="pw3" type="password">
                             <hr>
                             <hr>
                             <span>''' + load_lang('user') + ' ' + load_lang('skin') + '''</span>
                             <span>''' + load_lang('user') + ' ' + load_lang('skin') + '''</span>
                             <br>
                             <br>
@@ -2882,9 +2882,9 @@ def register():
             data =  '''
             data =  '''
                     <form method="post">
                     <form method="post">
                         ''' + contract + '''
                         ''' + contract + '''
-                        <input placeholder="id" name="id" type="text">
+                        <input placeholder="''' + load_lang('id') + '''" name="id" type="text">
                         <hr>
                         <hr>
-                        <input placeholder="password" name="pw" type="password">
+                        <input placeholder="''' + load_lang('password') + '''" name="pw" type="password">
                         <hr>
                         <hr>
                         <input placeholder="''' + load_lang('confirm') + '''" name="pw2" type="password">
                         <input placeholder="''' + load_lang('confirm') + '''" name="pw2" type="password">
                         <hr>
                         <hr>
@@ -2929,7 +2929,7 @@ def need_email(tool = 'pass_find'):
                 flask.session['c_key'] = ''.join(random.choice("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ") for i in range(16))
                 flask.session['c_key'] = ''.join(random.choice("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ") for i in range(16))
                 flask.session['c_id'] = flask.request.form.get('id', '')
                 flask.session['c_id'] = flask.request.form.get('id', '')
 
 
-                send_email(flask.request.form.get('email', ''), wiki_set()[0] + ' password find key', 'key : ' + flask.session['c_key'])
+                send_email(flask.request.form.get('email', ''), wiki_set()[0] + ' ' + load_lang('password') + ' ' + load_lang('search') + ' key', 'key : ' + flask.session['c_key'])
 
 
                 return redirect('/check_pass_key')
                 return redirect('/check_pass_key')
     else:
     else:
@@ -2949,10 +2949,10 @@ def need_email(tool = 'pass_find'):
             ))
             ))
         else:
         else:
             return easy_minify(flask.render_template(skin_check(),    
             return easy_minify(flask.render_template(skin_check(),    
-                imp = ['password ' + load_lang('search'), wiki_set(), custom(), other2([0, 0])],
+                imp = [load_lang('password') + ' ' + load_lang('search'), wiki_set(), custom(), other2([0, 0])],
                 data =  '''
                 data =  '''
                         <form method="post">
                         <form method="post">
-                            <input placeholder="id" name="id" type="text">
+                            <input placeholder="''' + load_lang('id') + '''" name="id" type="text">
                             <hr>
                             <hr>
                             <input placeholder="email" name="email" type="text">
                             <input placeholder="email" name="email" type="text">
                             <hr>
                             <hr>
@@ -3010,7 +3010,7 @@ def check_key(tool = 'check_pass_key'):
                 hashed = bcrypt.hashpw(bytes(flask.session['c_key'], 'utf-8'), bcrypt.gensalt()).decode()
                 hashed = bcrypt.hashpw(bytes(flask.session['c_key'], 'utf-8'), bcrypt.gensalt()).decode()
                 curs.execute("update user set pw = ? where id = ?", [hashed, flask.session['c_id']])
                 curs.execute("update user set pw = ? where id = ?", [hashed, flask.session['c_id']])
 
 
-                id = flask.session['c_id']
+                d_id = flask.session['c_id']
                 pw = flask.session['c_key']
                 pw = flask.session['c_key']
 
 
                 flask.session.pop('c_id', None)
                 flask.session.pop('c_id', None)
@@ -3019,9 +3019,9 @@ def check_key(tool = 'check_pass_key'):
                 return easy_minify(flask.render_template(skin_check(),    
                 return easy_minify(flask.render_template(skin_check(),    
                     imp = ['check', wiki_set(), custom(), other2([0, 0])],
                     imp = ['check', wiki_set(), custom(), other2([0, 0])],
                     data =  '''
                     data =  '''
-                            id : ''' + id + '''
+                            ''' + load_lang('id') + ' : ' + d_id + '''
                             <br>
                             <br>
-                            password : ''' + pw + '''
+                            ''' + load_lang('password') + ' : ' + pw + '''
                             ''',
                             ''',
                     menu = [['user', load_lang('user')]]
                     menu = [['user', load_lang('user')]]
                 ))
                 ))
@@ -3892,7 +3892,7 @@ def user_info():
         curs.execute("select data from other where name = 'email_have'")
         curs.execute("select data from other where name = 'email_have'")
         test = curs.fetchall()
         test = curs.fetchall()
         if test and test[0][0] != '':
         if test and test[0][0] != '':
-            plus += '<li><a href="/pass_find">password ' + load_lang('search') + '</a></li>'
+            plus += '<li><a href="/pass_find">' + load_lang('password') + ' ' + load_lang('search') + '</a></li>'
 
 
     return easy_minify(flask.render_template(skin_check(), 
     return easy_minify(flask.render_template(skin_check(), 
         imp = [load_lang('user') + ' ' + load_lang('tool'), wiki_set(), custom(), other2([0, 0])],
         imp = [load_lang('user') + ' ' + load_lang('tool'), wiki_set(), custom(), other2([0, 0])],

+ 1 - 0
language/en-US.json

@@ -26,6 +26,7 @@
     "move" : "move",
     "move" : "move",
     "hide" : "hide",
     "hide" : "hide",
     "list" : "list",
     "list" : "list",
+    "id" : "id",
     "out" : "out",
     "out" : "out",
     "revert" : "undo",
     "revert" : "undo",
     "version" : " ver",
     "version" : " ver",

+ 1 - 0
language/ko-KR.json

@@ -12,6 +12,7 @@
     "move": "이동",
     "move": "이동",
     "hide": "숨김",
     "hide": "숨김",
     "list": "목록",
     "list": "목록",
+    "id" : "아이디",
     "revert": "되돌리기",
     "revert": "되돌리기",
     "version": "판",
     "version": "판",
     "normal_version": "버전",
     "normal_version": "버전",

+ 1 - 1
views/main_css/main.css

@@ -21,7 +21,7 @@ input[type="checkbox"] { width: auto; }
 #cate { border: 1px solid; padding: 5px; }
 #cate { border: 1px solid; padding: 5px; }
 blockquote { border: 1px solid; padding: 15px; margin: 0; margin-top: 10px; }
 blockquote { border: 1px solid; padding: 15px; margin: 0; margin-top: 10px; }
 img, iframe { max-width: 100%; }
 img, iframe { max-width: 100%; }
-pre { border: 1px solid; padding: 10px; white-space: normal; }
+pre { border: 1px solid; padding: 10px; white-space: pre-wrap; }
 #in { margin-left: 20px; }
 #in { margin-left: 20px; }
 #out { margin-left: 5px; }
 #out { margin-left: 5px; }
 s, strike, del { color: gray; }
 s, strike, del { color: gray; }