Skip to content

Commit

Permalink
다시 언어 몇몇 값 추가
Browse files Browse the repository at this point in the history
  • Loading branch information
@surplus-dev
surplus-dev committed Oct 5, 2018
1 parent 979f7cf commit f87de7f
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 15 deletions.
28 changes: 14 additions & 14 deletions app.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2613,9 +2613,9 @@ def login():
imp = [load_lang('login'), wiki_set(), custom(), other2([0, 0])],
data = '''
<form method="post">
<input placeholder="id" name="id" type="text">
<input placeholder="''' + load_lang('id') + '''" name="id" type="text">
<hr>
<input placeholder="password" name="pw" type="password">
<input placeholder="''' + load_lang('password') + '''" name="pw" type="password">
<hr>
''' + captcha_get() + '''
<button type="submit">''' + load_lang('login') + '''</button>
Expand Down Expand Up @@ -2700,13 +2700,13 @@ def change_password():
<form method="post">
<span>id : ''' + ip + '''</span>
<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>
<input placeholder="''' + load_lang('new') + ''' password" name="pw2" type="password">
<input placeholder="''' + load_lang('new') + ' ' + load_lang('password') + '''" name="pw2" type="password">
<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>
<span>''' + load_lang('user') + ' ' + load_lang('skin') + '''</span>
<br>
Expand Down Expand Up @@ -2882,9 +2882,9 @@ def register():
data = '''
<form method="post">
''' + contract + '''
<input placeholder="id" name="id" type="text">
<input placeholder="''' + load_lang('id') + '''" name="id" type="text">
<hr>
<input placeholder="password" name="pw" type="password">
<input placeholder="''' + load_lang('password') + '''" name="pw" type="password">
<hr>
<input placeholder="''' + load_lang('confirm') + '''" name="pw2" type="password">
<hr>
Expand Down Expand Up @@ -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_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')
else:
Expand All @@ -2949,10 +2949,10 @@ def need_email(tool = 'pass_find'):
))
else:
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 = '''
<form method="post">
<input placeholder="id" name="id" type="text">
<input placeholder="''' + load_lang('id') + '''" name="id" type="text">
<hr>
<input placeholder="email" name="email" type="text">
<hr>
Expand Down Expand Up @@ -3010,7 +3010,7 @@ def check_key(tool = 'check_pass_key'):
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']])

id = flask.session['c_id']
d_id = flask.session['c_id']
pw = flask.session['c_key']

flask.session.pop('c_id', None)
Expand All @@ -3019,9 +3019,9 @@ def check_key(tool = 'check_pass_key'):
return easy_minify(flask.render_template(skin_check(),
imp = ['check', wiki_set(), custom(), other2([0, 0])],
data = '''
id : ''' + id + '''
''' + load_lang('id') + ' : ' + d_id + '''
<br>
password : ''' + pw + '''
''' + load_lang('password') + ' : ' + pw + '''
''',
menu = [['user', load_lang('user')]]
))
Expand Down Expand Up @@ -3892,7 +3892,7 @@ def user_info():
curs.execute("select data from other where name = 'email_have'")
test = curs.fetchall()
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(),
imp = [load_lang('user') + ' ' + load_lang('tool'), wiki_set(), custom(), other2([0, 0])],
Expand Down
1 change: 1 addition & 0 deletions language/en-US.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"move" : "move",
"hide" : "hide",
"list" : "list",
"id" : "id",
"out" : "out",
"revert" : "undo",
"version" : " ver",
Expand Down
1 change: 1 addition & 0 deletions language/ko-KR.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"move": "이동",
"hide": "숨김",
"list": "목록",
"id" : "아이디",
"revert": "되돌리기",
"version": "판",
"normal_version": "버전",
Expand Down
2 changes: 1 addition & 1 deletion views/main_css/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ input[type="checkbox"] { width: auto; }
#cate { border: 1px solid; padding: 5px; }
blockquote { border: 1px solid; padding: 15px; margin: 0; margin-top: 10px; }
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; }
#out { margin-left: 5px; }
s, strike, del { color: gray; }
Expand Down

0 comments on commit f87de7f

Please sign in to comment.