스킨 설정에 언어 연동되게

app.py

@@ -541,7 +541,21 @@ def title_random():
 
 @app.route('/skin_set')
 def skin_set():
-    return re_error('/error/5')
+    data = flask.make_response(re_error('/error/5'))
+
+    curs.execute("select data from other where name = 'language'")
+    main_data = curs.fetchall()
+
+    data.set_cookie('language', main_data[0][0])
+
+    curs.execute('select data from user_set where name = "lang" and id = ?', [ip_check()])
+    user_data = curs.fetchall()
+    if user_data:
+        data.set_cookie('user_language', user_data[0][0])
+    else:
+        data.set_cookie('user_language', main_data[0][0])
+
+    return data
     
 # API
 @app.route('/api/w/<everything:name>')

route/logout.py

@@ -3,7 +3,7 @@ from .tool.func import *
 def logout_2(conn):
     curs = conn.cursor()
 
-    flask.session['state'] = 0
+    flask.session.pop('state', None)
     flask.session.pop('id', None)
 
     return redirect('/user')

route/now_update.py

@@ -25,7 +25,7 @@ def now_update_2(conn):
             ok += [os.system('git remote add origin https://github.com/2DU/opennamu.git')]
             ok += [os.system('git fetch origin ' + up_data)]
             ok += [os.system('git reset --hard origin/' + up_data)]
-            if ok[0] == 0 and ok[1] == 0 and ok[2] == 0 and ok[3] == 0:
+            if (ok[0] and ok[1] and ok[2] and ok[3]) == 0:
                 return redirect('/restart')
         else:
             if platform.system() == 'Windows':

route/tool/func.py

@@ -1028,8 +1028,6 @@ def re_error(data):
                 data = load_lang('authority_error')
             elif num == 4:
                 data = load_lang('no_admin_block_error')
-            elif num == 5:
-                data = load_lang('skin_error')
             elif num == 6:
                 data = load_lang('same_id_exist_error')
             elif num == 7:

route/tool/set_mark/tool.py

@@ -9,7 +9,7 @@ def get_time():
     
 def ip_check(d_type = 0):
     if d_type == 0:
-        if flask.session and ('state' and 'id') in flask.session and flask.session['state'] == 1:
+        if flask.session and ('state' and 'id') in flask.session:
             ip = flask.session['id']
         else:
             try:

views/neo_yousoro/js/skin_set.js

@@ -65,8 +65,38 @@ main_load();
 
 window.onload = function () {
     if(window.location.pathname === '/skin_set') {
-        document.getElementById("main_top").innerHTML = '<h1>Skin settings</h1>';
-        document.title = document.title.replace(/.*(\- .*)$/, "Skin settings $1");
+        set_language = {
+            "en-US" : {
+                "default" : "Default",
+                "change_to_noraml" : "Change to normal text",
+                "delete" : "Delete",
+                "skin_setting" : "Skin settings",
+                "include_link" : "Using include link",
+                "save" : "Save",
+                "strike" : "Strike",
+                "bold" : "Bold",
+                "other" : "Other"
+            }, "ko-KR" : {
+                "default" : "기본값",
+                "change_to_noraml" : "일반 텍스트로 변경",
+                "delete" : "삭제",
+                "skin_setting" : "스킨 설정",
+                "include_link" : "틀 링크 사용",
+                "save" : "저장",
+                "strike" : "취소선",
+                "bold" : "볼드체",
+                "other" : "기타"
+            }
+        }
+
+        language = cookies.match(regex_data('language'))[1];
+        user_language = cookies.match(regex_data('user_language'))[1];
+        if(user_language in set_language) {
+            language = user_language;
+        }
+
+        document.getElementById("main_top").innerHTML = '<h1>' + set_language[language]['skin_setting'] + '</h1>';
+        document.title = document.title.replace(/.*(\- .*)$/, set_language[language]['skin_setting'] + " $1");
         
         data = document.getElementById("main_data");
         set_data = {};
@@ -74,56 +104,56 @@ window.onload = function () {
         if(cookies.match(regex_data('del_strike'))) {
             if(cookies.match(regex_data('del_strike'))[1] === '0') {
                 set_data["strike"] = ' \
-                    <option value="normal">Default</option> \
-                    <option value="change">Change to normal text</option> \
-                    <option value="delete">Delete</option> \
+                    <option value="normal">' + set_language[language]['default'] + '</option> \
+                    <option value="change">' + set_language[language]['change_to_normal'] + '</option> \
+                    <option value="delete">' + set_language[language]['delete'] + '</option> \
                 ';
             } else if(cookies.match(regex_data('del_strike'))[1] === '1') {
                 set_data["strike"] = ' \
-                    <option value="change">Change to normal text</option> \
-                    <option value="normal">Default</option> \
-                    <option value="delete">Delete</option> \
+                    <option value="change">' + set_language[language]['change_to_normal'] + '</option> \
+                    <option value="normal">' + set_language[language]['default'] + '</option> \
+                    <option value="delete">' + set_language[language]['delete'] + '</option> \
                 ';
             } else {
                 set_data["strike"] = ' \
-                    <option value="delete">Delete</option> \
-                    <option value="normal">Default</option> \
-                    <option value="change">Change to normal text</option> \
+                    <option value="delete">' + set_language[language]['delete'] + '</option> \
+                    <option value="normal">' + set_language[language]['default'] + '</option> \
+                    <option value="change">' + set_language[language]['change_to_normal'] + '</option> \
                 ';
             }
         } else {
             set_data["strike"] = ' \
-                <option value="normal">Default</option> \
-                <option value="change">Change to normal text</option> \
-                <option value="delete">Delete</option> \
+                <option value="normal">' + set_language[language]['default'] + '</option> \
+                <option value="change">' + set_language[language]['change_to_normal'] + '</option> \
+                <option value="delete">' + set_language[language]['delete'] + '</option> \
             ';
         }
 
         if(cookies.match(regex_data('del_bold'))) {
             if(cookies.match(regex_data('del_bold'))[1] === '0') {
                 set_data["bold"] = ' \
-                    <option value="normal">Default</option> \
-                    <option value="change">Change to normal text</option> \
-                    <option value="delete">Delete</option> \
+                    <option value="normal">' + set_language[language]['default'] + '</option> \
+                    <option value="change">' + set_language[language]['change_to_normal'] + '</option> \
+                    <option value="delete">' + set_language[language]['delete'] + '</option> \
                 ';
             } else if(cookies.match(regex_data('del_bold'))[1] === '1') {
                 set_data["bold"] = ' \
-                    <option value="change">Change to normal text</option> \
-                    <option value="normal">Default</option> \
-                    <option value="delete">Delete</option> \
+                    <option value="change">' + set_language[language]['change_to_normal'] + '</option> \
+                    <option value="normal">' + set_language[language]['default'] + '</option> \
+                    <option value="delete">' + set_language[language]['delete'] + '</option> \
                 ';
             } else {
                 set_data["bold"] = ' \
-                    <option value="delete">Delete</option> \
-                    <option value="normal">Default</option> \
-                    <option value="change">Change to normal text</option> \
+                    <option value="delete">' + set_language[language]['delete'] + '</option> \
+                    <option value="normal">' + set_language[language]['default'] + '</option> \
+                    <option value="change">' + set_language[language]['change_to_normal'] + '</option> \
                 ';
             }
         } else {
             set_data["bold"] = ' \
-                <option value="normal">Default</option> \
-                <option value="change">Change to normal text</option> \
-                <option value="delete">Delete</option> \
+                <option value="normal">' + set_language[language]['default'] + '</option> \
+                <option value="change">' + set_language[language]['change_to_normal'] + '</option> \
+                <option value="delete">' + set_language[language]['delete'] + '</option> \
             ';
         }
         
@@ -135,19 +165,19 @@ window.onload = function () {
         }
 
         data.innerHTML = ' \
-            <h2>Strike</h2> \
+            <h2>' + set_language[language]['strike'] + '</h2> \
             <hr class="main_hr"> \
             <select id="strike" name="strike"> \
                 ' + set_data["strike"] + ' \
             </select> \
-            <h2>Bold</h2> \
+            <h2>' + set_language[language]['bold'] + '</h2> \
             <select id="bold" name="bold"> \
                 ' + set_data["bold"] + ' \
             </select> \
-            <h2>Other</h2> \
-            <input ' + set_data["include"] + ' type="checkbox" id="include" name="include" value="include"> Using include link \
+            <h2>' + set_language[language]['other'] + '</h2> \
+            <input ' + set_data["include"] + ' type="checkbox" id="include" name="include" value="include"> ' + set_language[language]['include_link'] + ' \
             <hr class="main_hr"> \
-            <button onclick="get_post();">Save</button> \
+            <button onclick="get_post();">' + set_language[language]['save'] + '</button> \
         ';
     }
 }