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

app.py

@@ -612,4 +612,4 @@ if __name__=="__main__":
     http_server = tornado.httpserver.HTTPServer(tornado.wsgi.WSGIContainer(app))
     http_server.listen(server_set['port'], address=server_set['host'])
     
-    tornado.ioloop.IOLoop.instance().start()
+    tornado.ioloop.IOLoop.instance().start()

language/en-US.json

@@ -176,6 +176,14 @@
         "30_day" : "30 days",
         "180_day" : "180 days",
         "360_day" : "360 days",
+        "edit_button_link" : "Link",
+        "edit_button_footnote" : "Footnote",
+        "edit_button_macro" : "Macro",
+        "edit_button_color" : "Color",
+        "edit_button_bold" : "Bold",
+        "edit_button_strike" : "Strike",
+        "edit_button_big" : "Big",
+        "edit_button_paragraph" : "Paragraph",
         "_comment_2.1_" : "Filter",
             "_comment_2.1.1_" : "List",
                 "interwiki_list" : "Interwiki(s) list",

language/ko-KR.json

@@ -176,6 +176,14 @@
         "30_day" : "30일",
         "180_day" : "180일",
         "360_day" : "360일",
+        "edit_button_link" : "링크",
+        "edit_button_footnote" : "각주",
+        "edit_button_macro" : "매크로",
+        "edit_button_color" : "색상",
+        "edit_button_bold" : "강조",
+        "edit_button_strike" : "취소선",
+        "edit_button_big" : "크게",
+        "edit_button_paragraph" : "문단",
         "_comment_2.1_" : "필터",
             "_comment_2.1.1_" : "목록",
                 "interwiki_list" : "인터위키 목록",

route/give_user_ban.py

@@ -52,7 +52,9 @@ def give_user_ban_2(conn, name):
         curs.execute("select end, why from ban where block = ?", [name])
         end = curs.fetchall()
         if end:
-            now = load_lang('release')
+            main_name = name
+            b_now = load_lang('release')
+            now = '(' + b_now + ')'
 
             if end[0][0] == '':
                 data = '<ul><li>' + load_lang('limitless') + '</li>'

route/tool/func.py

@@ -362,11 +362,14 @@ def ip_or_user(data):
 
 def edit_button():
     insert_list = [
-        ['[[|]]', '[[|]]'], 
-        ['[*()]', '[*()]'], 
-        ['{{{#!}}}', '{{{#!}}}'], 
-        ['||<>||', '||<>||'], 
-        ["\\'\\'\\'", "\'\'\'"]
+        ['[[name|view]]', load_lang('edit_button_link')], 
+        ['[* data]', load_lang('edit_button_footnote')], 
+        ['[macro(data)]', load_lang('edit_button_macro')],
+        ['{{{#color data}}}', load_lang('edit_button_color')], 
+        ["\\'\\'\\'data\\'\\'\\'", load_lang('edit_button_bold')],
+        ["~~data~~", load_lang('edit_button_strike')],
+        ["{{{+number data}}}", load_lang('edit_button_big')],
+        ["== name ==", load_lang('edit_button_paragraph')]
     ]
 
     data = ''

version.json

@@ -4,7 +4,7 @@
         "c_ver" : "400001",
         "s_ver" : "2"
     }, "stable" : {
-        "r_ver" : "v3.1.0-stable-04",
+        "r_ver" : "v3.1.0-stable-05",
         "c_ver" : "400001",
         "s_ver" : "2"
     }