스킨 개편

app.py

@@ -3557,7 +3557,7 @@ def user_info():
         plus2 = ''
 
     return html_minify(render_template(skin_check(conn), 
-        imp = [load_lang('user') + ' ' + load_lang('list'), wiki_set(1), custom(conn), other2([0, 0])],
+        imp = [load_lang('user') + ' ' + load_lang('tool'), wiki_set(1), custom(conn), other2([0, 0])],
         data =  '''
                 <h2>상태</h2>
                 <ul>

func.py

@@ -32,7 +32,7 @@ def load_conn(data):
     conn = data
     curs = conn.cursor()
 
-    load_lang2(conn)
+    load_conn2(conn)
 
 def captcha_get(conn):
     data = ''
@@ -72,6 +72,7 @@ def captcha_post(test, num = 1):
 
 def load_lang(data):
     global lang
+
     try:
         if lang:
             pass
@@ -82,10 +83,13 @@ def load_lang(data):
         json_data = open(os.path.join('language', rep_data[0][0] + '.json'), 'rt', encoding='utf-8').read()
         lang = json.loads(json_data)
 
-    if data in lang:
-        return lang[data]
+    if data == 'please_all':
+        return lang
     else:
-        return else_lang[data]
+        if data in lang:
+            return lang[data]
+        else:
+            return else_lang[data]
 
 def edit_help_button():
     # https://stackoverflow.com/questions/11076975/insert-text-into-textarea-at-cursor-position-javascript
@@ -157,9 +161,7 @@ def next_fix(link, num, page, end = 50):
     return list_data
 
 def other2(origin):
-    lang_plus = []
-
-    return origin + ['Deleted', [lang_plus]]
+    return origin + ['Deleted', load_lang('please_all')]
 
 def wiki_set(num):
     if num == 1:
@@ -334,7 +336,7 @@ def acl_check(name):
     if ban_check(conn) == 1:
         return 1
 
-    acl_c = re.search("^' + load_lang('user') + ':([^/]*)", name)
+    acl_c = re.search("^" + load_lang('user') + ":([^/]*)", name)
     if acl_c:
         acl_n = acl_c.groups()
 

language/en-US.json

@@ -38,6 +38,7 @@
     "agreement" : "Agreement",
     "backlink" : "Back Link",
     "why" : "Why",
+    "random" : "Random",
     "authority" : "Authority",
     "file" : "File",
     "change" : "Change",

mark.py

@@ -7,7 +7,7 @@ from urllib import parse
 import time
 import threading
 
-def load_lang2(data):
+def load_conn2(data):
     global conn
     global curs
 

views/acme/index.html

@@ -38,35 +38,44 @@
                                 <input style="display: inline-block;" class="form-control search" type="search" name="search" placeholder="Search" id="searchInput" autocomplete="off">
                             </form>                
                         </li>
-                        <li>
-                            <a href="/recent_changes">
-                                <i class="fa fa-refresh" aria-hidden="true"></i>
-                                최근 변경
-                            </a>
-                        </li>
-                        <li>
-                            <a href="/recent_discuss">
-                                <i class="fa fa-comment" aria-hidden="true"></i>
-                                최근 토론
+                        <li class="dropdown">
+                            <a class="dropdown-toggle" data-close-others="false" data-delay="0" data-hover="dropdown" data-toggle="dropdown" href="javascript:void(0);">
+                                <i class="fa fa-plus-circle" aria-hidden="true"></i>
+                                {{imp[3][3]['recent']}}
+                                <i class="fa fa-angle-down"></i>
                             </a>
+                            <ul role="menu" class="dropdown-menu">
+                                <li>
+                                    <a href="/recent_changes">
+                                        <i class="fa fa-refresh" aria-hidden="true"></i>
+                                        {{imp[3][3]['change']}}
+                                    </a>
+                                </li>
+                                <li>
+                                    <a href="/recent_discuss">
+                                        <i class="fa fa-comment" aria-hidden="true"></i>
+                                        {{imp[3][3]['discussion']}}
+                                    </a>
+                                </li>
+                            </ul>
                         </li>
                         <li class="dropdown">
                             <a class="dropdown-toggle" data-close-others="false" data-delay="0" data-hover="dropdown" data-toggle="dropdown" href="javascript:void(0);">
                                 <i class="fa fa-plus-circle" aria-hidden="true"></i>
-                                나머지
+                                {{imp[3][3]['other']}}
                                 <i class="fa fa-angle-down"></i>
                             </a>
                             <ul role="menu" class="dropdown-menu">
                                 <li>
                                     <a href="/random">
                                         <i class="fa fa-random" aria-hidden="true"></i>
-                                        무작위
+                                        {{imp[3][3]['random']}}
                                     </a>
                                 </li>
                                 <li>
                                     <a href="/other">
                                         <i class="fa fa-cogs" aria-hidden="true"></i>
-                                        기타
+                                        {{imp[3][3]['tool']}}
                                     </a>
                                 </li>
                             </ul>