Surplus_Up (2DU) пре 8 година
родитељ
комит
844352c247
4 измењених фајлова са 18 додато и 8 уклоњено
  1. 11 5
      app.py
  2. 3 1
      language/en-US.json
  3. 3 1
      language/ko-KR.json
  4. 1 1
      views/acme/index.html

+ 11 - 5
app.py

@@ -101,7 +101,7 @@ if setup_tool == 0:
             setup_tool = 1
 
 if setup_tool != 0:
-        create_data = {}
+    create_data = {}
 
     create_data['all_data'] = [
         'data', 
@@ -2392,7 +2392,7 @@ def topic(name = None, sub = None):
 
         if ban != 1 or admin == 1:
             data += '''
-                    <a id="reload" href="javascript:void(0);" onclick="location.href.endsWith(\'#reload\')? location.reload(true):location.href=\'#reload\'">(Reload)</a>
+                    <a id="reload" href="javascript:void(0);" onclick="location.href.endsWith(\'#reload\')? location.reload(true):location.href=\'#reload\'">(''' + load_lang('reload') + ''')</a>
                     <form style="''' + display + '''" method="post">
                     <br>
                     <textarea style="height: 100px;" name="content"></textarea>
@@ -2402,7 +2402,7 @@ def topic(name = None, sub = None):
             if display == '':
                 data += ip_warring()
 
-            data += '<button type="submit">Send</button></form>'
+            data += '<button type="submit">' + load_lang('send') + '</button></form>'
 
         return css_html_js_minify.html_minify(flask.render_template(skin_check(), 
             imp = [name, wiki_set(), custom(), other2([' (' + load_lang('discussion') + ')', 0])],
@@ -2449,7 +2449,13 @@ def close_topic_list(name = None, tool = None):
             
             menu = [['w/' + url_pas(name), load_lang('document')]]
             
-            plus =  '<a href="/topic/' + url_pas(name) + '/close">(' + load_lang('close') + ')</a> <a href="/topic/' + url_pas(name) + '/agree">(' + load_lang('agreement') + ')</a><hr><input placeholder="' + load_lang('discussion') + ' ' + load_lang('name') + '" name="topic" type="text"><hr><button type="submit">' + load_lang('open') + '</button>'
+            plus =  '''
+                    <a href="/topic/''' + url_pas(name) + '''/close">(''' + load_lang('close') + ''')</a> <a href="/topic/''' + url_pas(name) + '''/agree">(''' + load_lang('agreement') + ''')</a>
+                    <hr>
+                    <input placeholder="''' + load_lang('discussion') + ' ' + load_lang('name') + '''" name="topic" type="text">
+                    <hr>
+                    <button type="submit">''' + load_lang('open') + '''</button>
+                    '''
 
         for data in curs.fetchall():
             curs.execute("select data, date, ip, block from topic where title = ? and sub = ? and id = '1'", [name, data[0]])
@@ -3769,7 +3775,7 @@ def custom_head_view():
             else:
                 data = ''
         else:
-            start = '<span>' + load_lang('user_css_warring') + '</span><hr>'
+            start = '<span>' + load_lang('user_head_warring') + '</span><hr>'
             
             if 'MyMaiToNight' in flask.session:
                 data = flask.session['MyMaiToNight']

+ 3 - 1
language/en-US.json

@@ -100,8 +100,10 @@
     "pass" : "Pass",
     "category" : "Category",
     "filter" : "Filter",
+    "send" : "Send",
+    "reload" : "Reload",
 
-    "user_css_warring" : "User's CSS will deleted if you close the browser or when you are editting as guest",
+    "user_head_warring" : "User's HEAD will deleted if you close the browser or when you are editting as guest",
     "http_warring" : "Warning : If you are not on HTTPS connection, your information can be leaked. We won't response to that.",
     "no_login_warring" : "Non-login status. IP is logged when working with non-login.",
     

+ 3 - 1
language/ko-KR.json

@@ -43,7 +43,7 @@
     "admin": "관리자",
     "owner": "소유자",
     "admin_group": "관리 그룹",
-    "user_css_warring": "비 로그인의 경우에는 사용자 CSS가 로그인하거나 브라우저 닫으면 날아갑니다.",
+    "user_head_warring": "비 로그인의 경우에는 사용자 HEAD가 로그인하거나 브라우저 닫으면 날아갑니다.",
     "http_warring": "주의 : 만 약 HTTPS 연결이 아닌 경우 데이터가 유출될 가능성이 있습니다. 이에 대해 책임지지 않습니다.",
     "new": "새",
     "need": "필요한",
@@ -87,6 +87,8 @@
     "under": "하위",
     "pass": "통과",
     "category": "분류",
+    "send" : "전송",
+    "reload" : "새로고침",
     "authority_error": "권한이  부족합니다.",
     "no_login_error": "비 로그인 상태 입니다.",
     "no_exist_user_error": "계정이 없습니다.",

+ 1 - 1
views/acme/index.html

@@ -37,7 +37,7 @@
                     <ul class="nav navbar-nav">
                         <li id="right-search">
                             <form method="post" action="/search" id="searchform" role="search">
-                                <input style="display: inline-block;" class="form-control search" type="search" name="search" placeholder="Search" id="searchInput" autocomplete="off">
+                                <input style="display: inline-block;" class="form-control search" type="search" name="search" placeholder="{{'search'|load_lang}}" id="searchInput" autocomplete="off">
                             </form>                
                         </li>
                         <li class="dropdown">